feat(dracut): make hostonly the default

Hostonly is already the default in the last dracut release,
but the default was set as a configuration file.

This commit changes that and sets the default inside the dracut.sh
script (unless of course a distribution or user overrides the default).

The hostonly configuration file is kept intentionally, but it is now
not used by the configure option by default.

diff --git a/configure b/configure
index b01b5fae3eb41e7be83eb3121bbbbcdd6c578927..6cdf271eb195e1540be9e5f2b02d30080735e968 100755 (executable)
--- a/configure
+++ b/configure
@@ -39,9 +39,6 @@ case " $ID $ID_LIKE " in
     *" suse "*)
         configprofile=opensuse
         ;;
-    *)
-        configprofile=hostonly
-        ;;
 esac
 
 # Little helper function for reading args from the commandline.

diff --git a/dracut.conf.d/debian/01-debian.conf b/dracut.conf.d/debian/01-debian.conf
index 3e2d77ae93d756d625aaff3dbb2ed775181b277a..fa9850c1367fa9bab147dc69c1acf7653cc79786 100644 (file)
--- a/dracut.conf.d/debian/01-debian.conf
+++ b/dracut.conf.d/debian/01-debian.conf
@@ -1,2 +1 @@
 # Debian/Ubuntu specific Dracut configuration
-hostonly="yes"

diff --git a/dracut.sh b/dracut.sh
index d0d58c09a670f5fc02a23275152a3379da845658..2442a8c6d0e32b4c11256ff05a1689aab1f7d91e 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -1319,8 +1319,12 @@ check_kernel_compress_support() {
     return $?
 }
 
-[[ ${hostonly-} == yes ]] && hostonly="-h"
-[[ ${hostonly-} != "-h" ]] && unset hostonly
+# hostonly shell variable defaults to "-h" if not specified
+if [[ ${hostonly-} == "no" ]]; then
+    unset hostonly
+else
+    hostonly="-h"
+fi
 
 if [[ ${hostonly-} ]]; then
     for i in /sys /proc /run /dev; do