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.
This commit is contained in:
Juan RP 2014-10-25 11:09:56 +02:00
parent 9fdd50f87a
commit a0b9abfb35
2 changed files with 4 additions and 5 deletions

View file

@ -15,8 +15,6 @@ if [ -x /bin/lz4 ]; then
args="--lz4" args="--lz4"
elif [ -x /bin/xz ]; then elif [ -x /bin/xz ]; then
args="--xz" args="--xz"
elif [ -x /bin/bzip2 ]; then
args="--bzip2"
fi fi
dracut -q --force $args boot/initramfs-${VERSION}.img ${VERSION} dracut -q --force $args boot/initramfs-${VERSION}.img ${VERSION}
exit $? exit $?

View file

@ -1,10 +1,10 @@
# Template file for 'dracut' # Template file for 'dracut'
pkgname=dracut pkgname=dracut
version=040 version=040
revision=1 revision=2
build_style=meta build_style=meta
hostmakedepends="libxslt docbook-xsl asciidoc" hostmakedepends="libxslt docbook-xsl asciidoc"
depends="psmisc cpio lz4" depends="psmisc cpio"
conf_files="/etc/dracut.conf" conf_files="/etc/dracut.conf"
make_dirs=" make_dirs="
/etc/dracut.conf.d 0755 root root /etc/dracut.conf.d 0755 root root
@ -23,8 +23,9 @@ do_build() {
do_install() { do_install() {
# fix path to busybox. # fix path to busybox.
sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh 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 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. # kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 10-dracut vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 10-dracut