[PATCH 1/4] 98usrmount: depend on fs-lib

[PATCH 1/4] 98usrmount: depend on fs-lib

[Amadeusz Żołnowski]

---
 modules.d/98usrmount/module-setup.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh
index 5844383..69d22d8 100755
--- a/modules.d/98usrmount/module-setup.sh
+++ b/modules.d/98usrmount/module-setup.sh
@@ -8,7 +8,7 @@ check() {
 }
 
 depends() {
-    return 0
+    echo 'fs-lib'
 }
 
 install() {
-- 
1.7.8.6

[PATCH 2/4] man pages: hostonly mode generates host-specific configuration

[Amadeusz Żołnowski]

This fact hasn't been mentioned.
---
 dracut.8.asc      |    4 ++--
 dracut.conf.5.asc |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dracut.8.asc b/dracut.8.asc
index cadd740..bab5996 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -232,8 +232,8 @@ Default:
     This is useful when running dracut from a git checkout.
 
 **-H, --hostonly**::
-    Host-Only mode: Install only what is needed for booting
-    the local host instead of a generic host.
+    Host-Only mode: Install only what is needed for booting the local host
+    instead of a generic host and generate host-specific configuration.
 +
 [WARNING]
 ====
diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
index 017a221..d17477d 100644
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -65,7 +65,8 @@ line are not interpreted.
     Strip binaries in the initramfs (default=yes)
 
 *hostonly=*"__{yes|no}__"::
-    Host-Only mode: Install only what is needed for booting the local host instead of a generic host.
+    Host-Only mode: Install only what is needed for booting the local host
+    instead of a generic host and generate host-specific configuration.
 
 *tmpdir=*"__<temporary directory>__"::
     Specify temporary directory to use.
-- 
1.7.8.6

[PATCH 3/4] dracut-lib.sh: Use "$*" instead of "$@" in warn, info, and so on...

[Amadeusz Żołnowski]

"$@" might cause some uneccessary word breaking.
---
 modules.d/99base/dracut-lib.sh |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 5dc3fbd..e63f3f0 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -297,12 +297,12 @@ source_conf() {
 
 die() {
     {
-        echo "<24>dracut: FATAL: $@";
+        echo "<24>dracut: FATAL: $*";
         echo "<24>dracut: Refusing to continue";
     } > /dev/kmsg
 
     {
-        echo "warn dracut: FATAL: \"$@\"";
+        echo "warn dracut: FATAL: \"$*\"";
         echo "warn dracut: Refusing to continue";
     } >> $hookdir/emergency/01-die.sh
 
@@ -327,25 +327,25 @@ if [ ! -x /lib/systemd/systemd ]; then
 
     warn() {
         check_quiet
-        echo "<28>dracut Warning: $@" > /dev/kmsg
-        echo "dracut Warning: $@" >&2
+        echo "<28>dracut Warning: $*" > /dev/kmsg
+        echo "dracut Warning: $*" >&2
     }
 
     info() {
         check_quiet
-        echo "<30>dracut: $@" > /dev/kmsg
+        echo "<30>dracut: $*" > /dev/kmsg
         [ "$DRACUT_QUIET" != "yes" ] && \
-            echo "dracut: $@"
+            echo "dracut: $*"
     }
 
 else
 
     warn() {
-        echo "Warning: $@" >&2
+        echo "Warning: $*" >&2
     }
 
     info() {
-        echo "$@"
+        echo "$*"
     }
 
 fi
@@ -827,7 +827,7 @@ emergency_shell()
     fi
 
     echo ; echo
-    warn $@
+    warn "$*"
     source_hook "$hook"
     echo
 
-- 
1.7.8.6

[PATCH 4/4] 90dmsquash-live: don't source fs-lib.sh as it is not used

[Amadeusz Żołnowski]

---
 modules.d/90dmsquash-live/dmsquash-live-root.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
index 990a55b..08f2381 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -3,7 +3,6 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
 
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
-- 
1.7.8.6