From: Harald Hoyer <harald@redhat.com>
Date: Thu, 26 Jan 2012 12:55:50 +0000 (+0100)
Subject: usrmove: install missing binaries and "set -x" only for rd.debug
X-Git-Tag: 015~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6334ffdbb0ff898667287df56f63a9d1b647ba19;p=thirdparty%2Fdracut.git

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 8bdf5abe5..6596a68ec 100755
--- 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 05b236623..04b44ca19 100755
--- 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 329507496..8a623b359 100755
--- 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