[dracut/f17] dracut-018-33.git20120510

Harald Hoyer harald at fedoraproject.org
Thu May 10 09:55:44 UTC 2012


commit 3db11dba8b15dfaa8b122d2bbddc0a466e03ae3d
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu May 10 11:54:10 2012 +0200

    dracut-018-33.git20120510
    
    - fix mediacheck
    Resolves: rhbz#817419

 0032-Fail-to-boot-if-mediacheck-fails-817419.patch |   23 ++++++++++++++++++++
 dracut.spec                                        |    7 +++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/0032-Fail-to-boot-if-mediacheck-fails-817419.patch b/0032-Fail-to-boot-if-mediacheck-fails-817419.patch
new file mode 100644
index 0000000..a635a32
--- /dev/null
+++ b/0032-Fail-to-boot-if-mediacheck-fails-817419.patch
@@ -0,0 +1,23 @@
+From 8d0a0dca62505343a94c6cef86f85ea6aa7c3ded Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl at redhat.com>
+Date: Wed, 9 May 2012 11:15:03 -0700
+Subject: [PATCH] Fail to boot if mediacheck fails (#817419)
+
+The return value of checkisomd5 was being ignored.
+---
+ modules.d/90dmsquash-live/dmsquash-live-root.sh |    2 +-
+ 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
+
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index 2aaec28..fdbd6f5 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -33,7 +33,7 @@ fi
+ getarg rd.live.check check || check=""
+ if [ -n "$check" ]; then
+     [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+-    checkisomd5 --verbose $livedev || :
++    checkisomd5 --verbose $livedev
+     if [ $? -ne 0 ]; then
+         die "CD check failed!"
+         exit 1
diff --git a/dracut.spec b/dracut.spec
index 4f25cf7..8f061d7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 32.git20120509%{?dist}
+Release: 33.git20120510%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -55,6 +55,7 @@ Patch28: 0028-fix-_getcmdline-arg-duplicating-bug-with-etc-cmdline.patch
 Patch29: 0029-ifcfg-fix-resolv.conf.patch
 Patch30: 0030-TEST-15-BTRFSRAID-add-one-more-partition-to-the-btrf.patch
 Patch31: 0031-ifcfg-write-ifcfg.sh-use-PREFIX-for-prefix-netmask-f.patch
+Patch32: 0032-Fail-to-boot-if-mediacheck-fails-817419.patch
 
 
 BuildArch: noarch
@@ -370,6 +371,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu May 10 2012 Harald Hoyer <harald at redhat.com> 018-33.git20120510
+- fix mediacheck
+Resolves: rhbz#817419
+
 * Wed May 09 2012 Harald Hoyer <harald at redhat.com> 018-32.git20120509
 - use PREFIX for netmask prefixes
 Resolves: rhbz#820185


More information about the scm-commits mailing list