Blame 0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch

Harald Hoyer 2e1225
From 6334ffdbb0ff898667287df56f63a9d1b647ba19 Mon Sep 17 00:00:00 2001
Harald Hoyer 2e1225
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 2e1225
Date: Thu, 26 Jan 2012 13:55:50 +0100
Harald Hoyer 2e1225
Subject: [PATCH] usrmove: install missing binaries and "set -x" only for
Harald Hoyer 2e1225
 rd.debug
Harald Hoyer 2e1225
Harald Hoyer 2e1225
---
Harald Hoyer 2e1225
 modules.d/30usrmove/do-usrmove.sh      |    6 +++++-
Harald Hoyer 2e1225
 modules.d/30usrmove/module-setup.sh    |    1 +
Harald Hoyer 2e1225
 modules.d/30usrmove/usrmove-convert.sh |    2 --
Harald Hoyer 2e1225
 3 files changed, 6 insertions(+), 3 deletions(-)
Harald Hoyer 2e1225
Harald Hoyer 2e1225
diff --git a/modules.d/30usrmove/do-usrmove.sh b/modules.d/30usrmove/do-usrmove.sh
Harald Hoyer 2e1225
index 8bdf5ab..6596a68 100755
Harald Hoyer 2e1225
--- a/modules.d/30usrmove/do-usrmove.sh
Harald Hoyer 2e1225
+++ b/modules.d/30usrmove/do-usrmove.sh
Harald Hoyer 2e1225
@@ -3,5 +3,9 @@
Harald Hoyer 2e1225
 # ex: ts=8 sw=4 sts=4 et filetype=sh
Harald Hoyer 2e1225
 
Harald Hoyer 2e1225
 if getargbool 0 rd.usrmove; then
Harald Hoyer 2e1225
-    usrmove-convert "$NEWROOT" 2>&1 | vinfo
Harald Hoyer 2e1225
+    if getargbool 0 rd.debug; then
Harald Hoyer 2e1225
+        bash -x usrmove-convert "$NEWROOT" 2>&1 | vinfo
Harald Hoyer 2e1225
+    else
Harald Hoyer 2e1225
+        usrmove-convert "$NEWROOT" 2>&1 | vinfo
Harald Hoyer 2e1225
+    fi
Harald Hoyer 2e1225
 fi
Harald Hoyer 2e1225
diff --git a/modules.d/30usrmove/module-setup.sh b/modules.d/30usrmove/module-setup.sh
Harald Hoyer 2e1225
index 05b2366..04b44ca 100755
Harald Hoyer 2e1225
--- a/modules.d/30usrmove/module-setup.sh
Harald Hoyer 2e1225
+++ b/modules.d/30usrmove/module-setup.sh
Harald Hoyer 2e1225
@@ -13,6 +13,7 @@ depends() {
Harald Hoyer 2e1225
 
Harald Hoyer 2e1225
 install() {
Harald Hoyer 2e1225
     dracut_install bash
Harald Hoyer 2e1225
+    dracut_install find ldconfig mv rm cp ln 
Harald Hoyer 2e1225
     inst_hook pre-pivot 99 "$moddir/do-usrmove.sh"
Harald Hoyer 2e1225
     inst "$moddir/usrmove-convert.sh" /usr/bin/usrmove-convert
Harald Hoyer 2e1225
 }
Harald Hoyer 2e1225
diff --git a/modules.d/30usrmove/usrmove-convert.sh b/modules.d/30usrmove/usrmove-convert.sh
Harald Hoyer 2e1225
index 3295074..8a623b3 100755
Harald Hoyer 2e1225
--- a/modules.d/30usrmove/usrmove-convert.sh
Harald Hoyer 2e1225
+++ b/modules.d/30usrmove/usrmove-convert.sh
Harald Hoyer 2e1225
@@ -2,8 +2,6 @@
Harald Hoyer 2e1225
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
Harald Hoyer 2e1225
 # ex: ts=8 sw=4 sts=4 et filetype=sh
Harald Hoyer 2e1225
 
Harald Hoyer 2e1225
-set -x
Harald Hoyer 2e1225
-
Harald Hoyer 2e1225
 ROOT="$1"
Harald Hoyer 2e1225
 
Harald Hoyer 2e1225
 if [[ ! -d "$ROOT" ]]; then