rpms
/
dracut
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dracut-037-3.git20140320 

- fixed dracut-initramfs-restore with microcode
This commit is contained in:
Harald Hoyer 2014-03-20 13:45:30 +01:00
parent f7ed6b1500
commit 81f34604aa
3 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch Normal file
View File

@ -0,0 +1,39 @@
From 0626cbe923732d45739ea6da4b816c78c44503ef Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 20 Mar 2014 13:18:13 +0100
Subject: [PATCH] dracut-initramfs-restore: fix unpacking with early microcode
---
dracut-initramfs-restore.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index f29c814..0dd1938 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -6,6 +6,10 @@ set -e
KERNEL_VERSION="$(uname -r)"
+[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+SKIP="$dracutbasedir/skipcpio"
+[[ -x $SKIP ]] || SKIP=cat
+
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
@@ -16,11 +20,11 @@ fi
cd /run/initramfs
[ -f .need_shutdown -a -f "$IMG" ] || exit 1
-if zcat "$IMG" | cpio -id --quiet >/dev/null; then
+if $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
rm -f -- .need_shutdown
-elif xzcat "$IMG" | cpio -id --quiet >/dev/null; then
+elif $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet >/dev/null; then
rm -f -- .need_shutdown
-elif lz4 -d -c "$IMG" | cpio -id --quiet >/dev/null; then
+elif $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet >/dev/null; then
rm -f -- .need_shutdown
else
# something failed, so we clean up

21
0002-systemd-add-systemd-gpt-auto-generator.patch Normal file
View File

@ -0,0 +1,21 @@
From a9f4b9cdb015a06adc280dd51e5c3dda3e82f515 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 20 Mar 2014 13:42:08 +0100
Subject: [PATCH] systemd: add systemd-gpt-auto-generator
---
modules.d/98systemd/module-setup.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index c72aad4..e7bf73b 100755
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -44,6 +44,7 @@ install() {
$systemdutildir/systemd-modules-load \
$systemdutildir/systemd-vconsole-setup \
$systemdutildir/system-generators/systemd-fstab-generator \
+ $systemdutildir/system-generators/systemd-gpt-auto-generator \
\
$systemdsystemunitdir/cryptsetup.target \
$systemdsystemunitdir/emergency.target \

9
dracut.spec
View File

@ -11,7 +11,7 @@
Name: dracut
Version: 037
Release: 1%{?dist}
Release: 3.git20140320%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@ -30,6 +30,8 @@ URL: https://dracut.wiki.kernel.org/
# Source can be generated by
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
Patch1: 0001-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch
Patch2: 0002-systemd-add-systemd-gpt-auto-generator.patch
BuildRequires: bash git
@ -478,7 +480,10 @@ rm -rf -- $RPM_BUILD_ROOT
%endif
%changelog
* Wed Mar 19 2014 Harald Hoyer <harald@redhat.com> 037-1
* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-3.git20140320
- fixed dracut-initramfs-restore with microcode
* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-1
- version 037
* Thu Feb 06 2014 Harald Hoyer <harald@redhat.com> 036-16.git20140206