From 64ee969dde7b916d168a78d096046885c033e274 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 4 Jun 2012 23:45:38 +0200 Subject: [PATCH] dracut: update to 019. --- .../dracut/patches/001-check-for-valid-init.patch | 14 -------------- ...msquash-live-root-dont-harcode-mount-path.patch | 14 -------------- srcpkgs/dracut/template | 6 +++--- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/dracut/patches/001-check-for-valid-init.patch delete mode 100644 srcpkgs/dracut/patches/002-dmsquash-live-root-dont-harcode-mount-path.patch diff --git a/srcpkgs/dracut/patches/001-check-for-valid-init.patch b/srcpkgs/dracut/patches/001-check-for-valid-init.patch deleted file mode 100644 index b9ed41d319..0000000000 --- a/srcpkgs/dracut/patches/001-check-for-valid-init.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/srcpkgs/dracut/patches/002-dmsquash-live-root-dont-harcode-mount-path.patch b/srcpkgs/dracut/patches/002-dmsquash-live-root-dont-harcode-mount-path.patch deleted file mode 100644 index bf10ce717b..0000000000 --- a/srcpkgs/dracut/patches/002-dmsquash-live-root-dont-harcode-mount-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 7a1cd88a0f..40b5aeec08 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=018 -revision=5 +version=019 +revision=1 noarch=yes build_style=gnu-makefile make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system" @@ -16,7 +16,7 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=0d761dc19d116db82d0d7bf93d0c8c23179fb32c8d7b3b843acfb27d3633d565 +checksum=5e151519c9cd7aaf81bf7749a3ed6b23724b8591b1cf034add3454697a286fe1 long_desc=" Unlike existing initramfs, this is an attempt at having as little as possible hard-coded into the initramfs as possible. The initramfs has (basically) one