usrmove: install missing binaries and "set -x" only for rd.debug

diff --git a/modules.d/30usrmove/do-usrmove.sh b/modules.d/30usrmove/do-usrmove.sh
index 8bdf5abe5795ec3eb0dbfc30ed47218fac44e807..6596a68ecd6b35c99a5a23bc2992e3b0466a2727 100755 (executable)
--- a/modules.d/30usrmove/do-usrmove.sh
+++ b/modules.d/30usrmove/do-usrmove.sh
@@ -3,5 +3,9 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 if getargbool 0 rd.usrmove; then
-    usrmove-convert "$NEWROOT" 2>&1 | vinfo
+    if getargbool 0 rd.debug; then
+        bash -x usrmove-convert "$NEWROOT" 2>&1 | vinfo
+    else
+        usrmove-convert "$NEWROOT" 2>&1 | vinfo
+    fi
 fi

diff --git a/modules.d/30usrmove/module-setup.sh b/modules.d/30usrmove/module-setup.sh
index 05b23662339e8d2f1021948efaf626b4a410bab5..04b44ca198673dc3e409c14e02f80fa1e433998a 100755 (executable)
--- a/modules.d/30usrmove/module-setup.sh
+++ b/modules.d/30usrmove/module-setup.sh
@@ -13,6 +13,7 @@ depends() {
 
 install() {
     dracut_install bash
+    dracut_install find ldconfig mv rm cp ln 
     inst_hook pre-pivot 99 "$moddir/do-usrmove.sh"
     inst "$moddir/usrmove-convert.sh" /usr/bin/usrmove-convert
 }

diff --git a/modules.d/30usrmove/usrmove-convert.sh b/modules.d/30usrmove/usrmove-convert.sh
index 3295074968eb3c2909cea8dce0d9d60a37849857..8a623b3590f5907b48aa3f8603d3017d4214251d 100755 (executable)
--- a/modules.d/30usrmove/usrmove-convert.sh
+++ b/modules.d/30usrmove/usrmove-convert.sh
@@ -2,8 +2,6 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-set -x
-
 ROOT="$1"
 
 if [[ ! -d "$ROOT" ]]; then