diff --git a/0004-dracut-honor-binaries-in-sbin-first.patch b/0004-dracut-honor-binaries-in-sbin-first.patch new file mode 100644 index 0000000..bb1639d --- /dev/null +++ b/0004-dracut-honor-binaries-in-sbin-first.patch @@ -0,0 +1,31 @@ +From 7b2d3d995c97652a13880b279bfc602e47bcda9c Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 9 Feb 2012 13:58:13 +0100 +Subject: [PATCH] dracut: honor binaries in sbin first + +--- + dracut | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dracut b/dracut +index 545f9db..fb46d70 100755 +--- a/dracut ++++ b/dracut +@@ -279,14 +279,14 @@ if ! [[ $kernel ]]; then + fi + [[ $outfile ]] || outfile="/boot/initramfs-$kernel.img" + +-for i in /usr/bin /bin /usr/sbin /sbin; do ++for i in /usr/sbin /sbin /usr/bin /bin; do + rl=$i + if [ -L "$i" ]; then + rl=$(readlink -f $i) + fi +- NPATH="$NPATH:$rl" ++ NPATH+=":$rl" + done +-export PATH="$NPATH" ++export PATH="${NPATH#:}" + unset NPATH + unset LD_LIBRARY_PATH + unset GREP_OPTIONS diff --git a/0005-98usrmount-mount-usr.sh-remove-extra-slash.patch b/0005-98usrmount-mount-usr.sh-remove-extra-slash.patch new file mode 100644 index 0000000..60a2380 --- /dev/null +++ b/0005-98usrmount-mount-usr.sh-remove-extra-slash.patch @@ -0,0 +1,23 @@ +From 075de7be458c4135f277d900c83bb7c3960dde8d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 9 Feb 2012 13:58:49 +0100 +Subject: [PATCH] 98usrmount/mount-usr.sh: remove extra slash + +otherwise we have /sysroot//usr in fstab +--- + modules.d/98usrmount/mount-usr.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh +index b24446a..5139c7a 100755 +--- a/modules.d/98usrmount/mount-usr.sh ++++ b/modules.d/98usrmount/mount-usr.sh +@@ -11,7 +11,7 @@ mount_usr() + # check, if we have to mount the /usr filesystem + while read _dev _mp _fs _opts _rest; do + if [ "$_mp" = "/usr" ]; then +- echo "$_dev $NEWROOT/$_mp $_fs ${_opts} $_rest" ++ echo "$_dev ${NEWROOT}${_mp} $_fs ${_opts} $_rest" + _usr_found="1" + break + fi diff --git a/0006-99shutdown-shutdown-don-t-do-console_init-on-shutdow.patch b/0006-99shutdown-shutdown-don-t-do-console_init-on-shutdow.patch new file mode 100644 index 0000000..d2f7b76 --- /dev/null +++ b/0006-99shutdown-shutdown-don-t-do-console_init-on-shutdow.patch @@ -0,0 +1,22 @@ +From 81dcf7c90a853d91009888dbff6670bb483c0716 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 9 Feb 2012 14:16:31 +0100 +Subject: [PATCH] 99shutdown/shutdown: don't do console_init on shutdown + emergency + +--- + modules.d/99shutdown/shutdown | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/modules.d/99shutdown/shutdown b/modules.d/99shutdown/shutdown +index 64937fa..2576687 100755 +--- a/modules.d/99shutdown/shutdown ++++ b/modules.d/99shutdown/shutdown +@@ -26,7 +26,6 @@ emergency_shell() + source_hook shutdown-emergency + echo + if getargbool 1 rd.shell -y rdshell || getarg rd.break rdbreak; then +- [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/console + echo "Dropping to debug shell." + echo + export PS1="$_rdshell_name:\${PWD}# " diff --git a/dracut.spec b/dracut.spec index 5e720d5..cee3d8c 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 015 -Release: 4.git20120209%{?dist} +Release: 7.git20120209%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -27,6 +27,9 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar Patch1: 0001-dracut-setup-clean-PATH-w-o-existing-one.patch Patch2: 0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch Patch3: 0003-lsinitrd-silence-xz-test.patch +Patch4: 0004-dracut-honor-binaries-in-sbin-first.patch +Patch5: 0005-98usrmount-mount-usr.sh-remove-extra-slash.patch +Patch6: 0006-99shutdown-shutdown-don-t-do-console_init-on-shutdow.patch BuildArch: noarch @@ -310,6 +313,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Thu Feb 09 2012 Harald Hoyer 015-7.git20120209 +- update to latest git + * Thu Feb 09 2012 Harald Hoyer 015-4.git20120209 - update to latest git