dracut: add 2 useful patches from upstream git master.

This commit is contained in:
Juan RP 2012-11-23 02:42:33 +01:00
parent 30e533a4e8
commit 50bfdea29c
3 changed files with 52 additions and 1 deletions

View file

@ -0,0 +1,25 @@
From 636e5cd2d53c8165a0dc5f857af643fd15faea9d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 19 Oct 2012 11:09:38 +0200
Subject: [PATCH 1/4] dracut.sh: only save $kernel_cmdline, if set
---
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index e160641..aab850e 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -937,7 +937,7 @@ fi
if [[ $kernel_only != yes ]]; then
(( ${#install_items[@]} > 0 )) && dracut_install ${install_items[@]}
- echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
+ [[ $kernel_cmdline ]] && echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
while pop fstab_lines line; do
echo "$line 0 0" >> "${initdir}/etc/fstab"
--
1.8.0

View file

@ -0,0 +1,25 @@
From b26897fb6099ed9ee67ed6e19e751be11d38fcf3 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 19 Oct 2012 11:20:07 +0200
Subject: [PATCH] dracut.sh: only 'warn' not 'error', if we don't strip
---
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
index aab850e..e463404 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1031,7 +1031,7 @@ fi
if [[ $do_strip = yes ]] ; then
for p in strip xargs find; do
if ! type -P $p >/dev/null; then
- derror "Could not find '$p'. You should run $0 with '--nostrip'."
+ dwarn "Could not find '$p'. Not stripping the initramfs."
do_strip=no
fi
done
--
1.8.0

View file

@ -1,7 +1,8 @@
# Template file for 'dracut'
pkgname=dracut
version=024
revision=3
revision=4
patch_args="-Np1"
build_style=gnu-makefile
make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"