dracut: add 2 patches that will be submitted upstream.

This commit is contained in:
Juan RP 2012-05-28 15:41:05 +02:00
parent 1b18b07690
commit aec7069f7b
3 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,14 @@
Make sure to check in correct path for a valid init. This was failing if
/sbin/init is a symlink to /lib/systemd/systemd in voidlinux.
--- modules.d/99base/init.sh.orig 2012-05-28 15:28:06.363878326 +0200
+++ modules.d/99base/init.sh 2012-05-28 15:29:03.361485893 +0200
@@ -234,7 +234,7 @@ for i in "$(getarg real_init=)" "$(getar
[ -n "$i" ] || continue
__p=$(readlink -f "${NEWROOT}/${i}")
- if [ -x "$__p" ]; then
+ if [ -x "$__p" -o -x "${NEWROOT}/${__p}" ]; then
INIT="$i"
break
fi

View File

@ -0,0 +1,14 @@
mount(8) might not be available in /bin/mount as dmsquash-live-root.sh expects.
It will be in PATH anyway.
--- modules.d/90dmsquash-live/dmsquash-live-root.sh.orig 2012-05-28 15:35:50.791973219 +0200
+++ modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-05-28 15:35:59.742754521 +0200
@@ -204,7 +204,7 @@ if [ -b "$BASE_LOOPDEV" ]; then
ln -s $BASE_LOOPDEV /run/initramfs/live-baseloop
fi
ln -s /dev/mapper/live-rw /dev/root
-printf '/bin/mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > $hookdir/mount/01-$$-live.sh
+printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > $hookdir/mount/01-$$-live.sh
need_shutdown

View File

@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=018
revision=1
revision=2
noarch=yes
build_style=gnu-makefile
make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system"