[master] Continue booting when checkisomd5 is aborted (#891551)
Brian C. Lane
bcl at redhat.com
Fri Feb 22 03:29:35 UTC 2013
From: "Brian C. Lane" <bcl at redhat.com>
---
anaconda.spec.in | 3 ++-
dracut/anaconda-diskroot | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 85585f0..a6551b9 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -35,6 +35,7 @@ Source0: %{name}-%{version}.tar.bz2
%define pythonurlgrabberver 3.9.1-5
%define utillinuxver 2.15.1
%define dracutver 024-16
+%define isomd5sum 1.0.10
BuildRequires: audit-libs-devel
BuildRequires: gettext >= %{gettextver}
@@ -102,7 +103,7 @@ Requires: GConf2 >= %{gconfversion}
%ifarch s390 s390x
Requires: openssh
%endif
-Requires: isomd5sum
+Requires: isomd5sum >= %{isomd5sum}
Requires: yum-utils >= %{yumutilsver}
Requires: NetworkManager >= %{nmver}
Requires: nm-connection-editor
diff --git a/dracut/anaconda-diskroot b/dracut/anaconda-diskroot
index 21c8afe..2df6248 100755
--- a/dracut/anaconda-diskroot
+++ b/dracut/anaconda-diskroot
@@ -15,10 +15,13 @@ run_checkisomd5() {
if [ -n "$DRACUT_SYSTEMD" ]; then
p=$(str_replace "$livedev" "-" '\x2d')
systemctl start checkisomd5@${p}.service
+ status=$(systemctl -p ExecMainStatus show checkisomd5@${p}.service)
+ splitsep "=" "$status" ignore rc
else
checkisomd5 --verbose $livedev
+ rc=$?
fi
- if [ $? -ne 0 ]; then
+ if [ "$rc" == "1" ]; then
die "CD check failed!"
exit 1
fi
--
1.8.1.2
More information about the anaconda-patches
mailing list