Re: [PATCH 1/3] add a new option "testonly"

[Vivek Goyal <vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

Bao,

This is harald's call but personally to me this testonly options look
little odd.

I am looking at old discussion here.

http://thread.gmane.org/gmane.linux.kernel.initramfs/3370

So harald's suggestion of using systemd looks fine. It is just a matter of
figuring out who should load watchdog modules in initramfs.

I personally feel it should be watchdog module but if harald does not
like it, we can atleast for the time being keep that logic in kdump
module. But trying to create this testonly mode feels odd to me.

Harald, can you please let us know your preference on this. Modify
04watchdog module to include relevant drivers in hostonly mode or
push this logic into kdump module for now.

Thanks
Vivek

On Wed, Jan 15, 2014 at 08:53:48PM +0800, Baoquan He wrote:
> Since 04watchdog is used only for test cases. If watchdog want to
> be handled, the relevant operation need be differentiated. In this
> patch add a new option "testonly" to set. User can set
> "--testonly" or "--no-testonly" to decide current execution is for
> test cases running or building normal initram.
> ---
>  dracut-bash-completion.sh |  3 ++-
>  dracut.8.asc              |  7 +++++++
>  dracut.conf               |  4 ++++
>  dracut.conf.5.asc         |  3 +++
>  dracut.sh                 | 10 +++++++++-
>  5 files changed, 25 insertions(+), 2 deletions(-)
> 
> diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh
> index 9f359c6..b713b14 100644
> --- a/dracut-bash-completion.sh
> +++ b/dracut-bash-completion.sh
> @@ -34,7 +34,8 @@ _dracut() {
>                                --local --hostonly --no-hostonly --fstab --help --bzip2 --lzma
>                                --xz --no-compress --gzip --list-modules --show-modules --keep
>                                --printsize --regenerate-all --noimageifnotneeded --early-microcode
> -                              --no-early-microcode --print-cmdline --prelink --noprelink'
> +                              --no-early-microcode --print-cmdline --prelink --noprelink
> +                              --testonly --no-testonly'
>  
>                         [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
>                                --omit-drivers --modules --omit --drivers --filesystems --install
> diff --git a/dracut.8.asc b/dracut.8.asc
> index d381dcf..1115f69 100644
> --- a/dracut.8.asc
> +++ b/dracut.8.asc
> @@ -203,6 +203,13 @@ example:
>  **--nolvmconf**::
>      do not include local _/etc/lvm/lvm.conf_
>  
> +
> +**--testonly**::
> +    execute to run test cases
> +
> +**--no-testonly**::
> +    execute to build normal initram
> +
>  **--fscks** [LIST]::
>      add a space-separated list of fsck tools, in addition to _dracut.conf_'s
>      specification; the installation is opportunistic (non-existing tools are
> diff --git a/dracut.conf b/dracut.conf
> index 8533f99..d18d185 100644
> --- a/dracut.conf
> +++ b/dracut.conf
> @@ -33,6 +33,10 @@
>  
>  # install local /etc/lvm/lvm.conf
>  #lvmconf="no"
> +#
> +
> +#execute to build normal initram, not for test cases running 
> +#testonly="no"
>  
>  # A list of fsck tools to install. If it's not specified, module's hardcoded
>  # default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
> diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
> index 30b7e03..3921f61 100644
> --- a/dracut.conf.5.asc
> +++ b/dracut.conf.5.asc
> @@ -104,6 +104,9 @@ If chrooted to another root other than the real root device, use --fstab and pro
>  *lvmconf=*"__{yes|no}__"::
>      Include local _/etc/lvm/lvm.conf_ (default=yes)
>  
> +*testonly=*"__{yes|no}__"::
> +    execute to run test cases only (default=no)
> +
>  *fscks=*" __<fsck tools>__ "::
>      Add a space-separated list of fsck tools. If nothing is specified, the
>      default is: "umount mount /sbin/fsck* xfs_db xfs_check xfs_repair e2fsck
> diff --git a/dracut.sh b/dracut.sh
> index 11dcd0e..88920b3 100755
> --- a/dracut.sh
> +++ b/dracut.sh
> @@ -107,6 +107,8 @@ Creates initial ramdisk images for preloading modules
>    --nomdadmconf         Do not include local /etc/mdadm.conf
>    --lvmconf             Include local /etc/lvm/lvm.conf
>    --nolvmconf           Do not include local /etc/lvm/lvm.conf
> +  --testonly            Execute to run test cases
> +  --no-testonly         Execute for real initram building 
>    --fscks [LIST]        Add a space-separated list of fsck helpers.
>    --nofscks             Inhibit installation of any fsck helpers.
>    --ro-mnt              Mount / and /usr read-only by default.
> @@ -333,6 +335,8 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
>      --long nomdadmconf \
>      --long lvmconf \
>      --long nolvmconf \
> +    --long testonly \
> +    --long no-testonly \
>      --long debug \
>      --long profile \
>      --long sshkey: \
> @@ -417,6 +421,8 @@ while :; do
>          --nomdadmconf) mdadmconf_l="no";;
>          --lvmconf)     lvmconf_l="yes";;
>          --nolvmconf)   lvmconf_l="no";;
> +        --testonly)    testonly_l="yes";;
> +        --no-testonly) testonly_l="no";;
>          --debug)       debug="yes";;
>          --profile)     profile="yes";;
>          --sshkey)      sshkey="$2"; shift;;
> @@ -682,6 +688,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
>  [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
>  [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
>  [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
> +[[ $testonly_l ]] && testonly=$testonly_l
> +[[ $testonly ]] || testonly=no
>  [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
>  [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
>  [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
> @@ -1062,7 +1070,7 @@ export initdir dracutbasedir dracutmodules \
>      debug host_fs_types host_devs sshkey add_fstab \
>      DRACUT_VERSION udevdir prefix filesystems drivers \
>      systemdutildir systemdsystemunitdir systemdsystemconfdir \
> -    host_modalias host_modules
> +    host_modalias host_modules testonly
>  
>  mods_to_load=""
>  # check all our modules to see if they should be sourced.
> -- 
> 1.8.3.1