changed hostonly documentation and handling

diff --git a/dracut b/dracut
index 91ca6849c37177d1126fc19de7156fc00b602d4c..b43817371a0c2f0ee714451ba0edcf3080d01348 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -145,6 +145,7 @@ fi
 fw_dir=${fw_dir//:/ }
 
 [[ $hostonly = yes ]] && hostonly="-h"
+[[ $hostonly != "-h" ]] && unset hostonly
 
 if [[ -f $dracutbasedir/dracut-functions ]]; then
    . $dracutbasedir/dracut-functions

diff --git a/dracut-functions b/dracut-functions
index 134ad3ceab91760e5aa4abffe79f889ea8615ee4..ca35eaf0db758604193ca7100d63841e77c44162 100755 (executable)
--- a/dracut-functions
+++ b/dracut-functions
@@ -449,7 +449,7 @@ for_each_kmod_dep() {
 # If it is not, we will look at all kernel modules
 # This function returns the full filenames of modules that match $1
 filter_kernel_modules () (
-    if [[ $hostonly = '' ]]; then
+    if ! [[ $hostonly ]]; then
        filtercmd='find "$srcmods/kernel/drivers" -name "*.ko"'
     else
        filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'

diff --git a/dracut.conf b/dracut.conf
index 8c8db2197f45fc1a6e3b38540a59037930cf44bd..24dbbefcfd2f44dc6d9678d649a13fd2a4104d1a 100644 (file)
--- a/dracut.conf
+++ b/dracut.conf
@@ -13,7 +13,7 @@
 #filesystems=""
 
 # build initrd only to boot current hardware
-#hostonly="-h"
+#hostonly="yes"
 #
 
 # install local /etc/mdadm.conf

diff --git a/dracut.conf.5 b/dracut.conf.5
index 0bd702b9e421df2fc12a608256e6ddd1fe34aceb..1b7b33df47eb7d4496abe0cf0e4f9c41010c1198 100644 (file)
--- a/dracut.conf.5
+++ b/dracut.conf.5
@@ -45,7 +45,7 @@ Specify additional directories, where to look for firmwares, separated by :
 .BR do_strip="yes|no"
 Strip binaries in the initramfs (default=yes)
 .TP
-.BR hostonly="-h|"
+.BR hostonly="yes|no"
 Host-Only mode: Install only what is needed for booting 
 the local host instead of a generic host.
 .TP

diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel
index 95036fe019d5210efedc8e2fcc7fd15ad3995a79..b966370a034f8f4f9b9240c6cf4a99953ab25fdc 100755 (executable)
--- a/modules.d/90kernel-modules/installkernel
+++ b/modules.d/90kernel-modules/installkernel
@@ -10,7 +10,7 @@ if [[ -z $drivers ]]; then
     instmods "=drivers/pcmcia" =ide "=drivers/usb/storage"
     instmods $(filter_kernel_modules block_module_test) 
     # if not on hostonly mode, install all known filesystems if the required list is not set via the filesystems variable
-    if [[ $hostonly = '' ]]; then
+    if ! [[ $hostonly ]]; then
        if [[ -z $filesystems ]]; then
            instmods '=fs'
        else