diff --git a/0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch b/0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch new file mode 100644 index 0000000..685da96 --- /dev/null +++ b/0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch @@ -0,0 +1,52 @@ +From 6334ffdbb0ff898667287df56f63a9d1b647ba19 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 26 Jan 2012 13:55:50 +0100 +Subject: [PATCH] usrmove: install missing binaries and "set -x" only for + rd.debug + +--- + modules.d/30usrmove/do-usrmove.sh | 6 +++++- + modules.d/30usrmove/module-setup.sh | 1 + + modules.d/30usrmove/usrmove-convert.sh | 2 -- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/modules.d/30usrmove/do-usrmove.sh b/modules.d/30usrmove/do-usrmove.sh +index 8bdf5ab..6596a68 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 05b2366..04b44ca 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 3295074..8a623b3 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 diff --git a/dracut.spec b/dracut.spec index 44d8319..5e7d419 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 014 -Release: 72.git20120126%{?dist} +Release: 73.git20120126%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -95,6 +95,7 @@ Patch68: 0068-95ssh-client-module-setup.sh-spell-corrections.patch Patch69: 0069-95ssh-client-module-setup.sh-do-not-install-ssh-clie.patch Patch70: 0070-add-usrmove-module.patch Patch71: 0071-dracut.spec-add-compat-symlinks-to-sbin.patch +Patch72: 0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch BuildArch: noarch @@ -385,6 +386,9 @@ return 0 %dir /var/lib/dracut/overlay %changelog +* Thu Jan 26 2012 Harald Hoyer 014-73.git20120126 +- update to latest git + * Thu Jan 26 2012 Harald Hoyer 014-72.git20120126 - update to latest git