From a0b9abfb354056c9923fee1dc29dcb2342f31a7b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 25 Oct 2014 11:09:56 +0200 Subject: [PATCH] dracut: fix gzipped initramfs; wtf is --rsyncable?!! - Do not depend on lz4 directly, just prefer lz4 if the bin is there. - Fallback to gzip rather than bzip2 compression if lz4/xz are not available. - Remove --rsyncable argument in gzipped initramfs, WTF IS IT??? IT'S NOT IN UPSTREAM. --- srcpkgs/dracut/files/kernel-hook-postinst | 2 -- srcpkgs/dracut/template | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dracut/files/kernel-hook-postinst b/srcpkgs/dracut/files/kernel-hook-postinst index c82b4729bb8..f82e0a8b4bb 100644 --- a/srcpkgs/dracut/files/kernel-hook-postinst +++ b/srcpkgs/dracut/files/kernel-hook-postinst @@ -15,8 +15,6 @@ if [ -x /bin/lz4 ]; then args="--lz4" elif [ -x /bin/xz ]; then args="--xz" -elif [ -x /bin/bzip2 ]; then - args="--bzip2" fi dracut -q --force $args boot/initramfs-${VERSION}.img ${VERSION} exit $? diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index f3d5d61abc6..4092d35b01f 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,10 +1,10 @@ # Template file for 'dracut' pkgname=dracut version=040 -revision=1 +revision=2 build_style=meta hostmakedepends="libxslt docbook-xsl asciidoc" -depends="psmisc cpio lz4" +depends="psmisc cpio" conf_files="/etc/dracut.conf" make_dirs=" /etc/dracut.conf.d 0755 root root @@ -23,8 +23,9 @@ do_build() { do_install() { # fix path to busybox. sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh - make DESTDIR=${DESTDIR} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system install + # Remove --rsyncable argument for gzip WTF?? + sed -i 's,--rsyncable,,g' ${DESTDIR}/usr/bin/dracut # kernel hooks. vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 10-dracut