diff options
| author | Brian C. Lane <bcl@redhat.com> | 2013-02-20 17:01:28 -0800 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2013-02-26 09:11:53 -0800 |
| commit | d42bd03f491955bb124f9fc87a4effce62abbdb5 (patch) | |
| tree | d397527d347a1392423bd8713efc40fcc9feb012 | |
| parent | 7bbef9e1291fe9d17254980d280a7123711af51b (diff) | |
| download | anaconda-d42bd03f491955bb124f9fc87a4effce62abbdb5.tar.gz anaconda-d42bd03f491955bb124f9fc87a4effce62abbdb5.tar.xz anaconda-d42bd03f491955bb124f9fc87a4effce62abbdb5.zip | |
Continue booting when checkisomd5 is aborted (#891551)
| -rw-r--r-- | anaconda.spec.in | 3 | ||||
| -rwxr-xr-x | dracut/anaconda-diskroot | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in index 85585f029..a6551b971 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 21c8afec2..2df624801 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 |