summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-10-24 02:33:34 +0000
committerJeremy Katz <katzj@redhat.com>2007-10-24 02:33:34 +0000
commit5e1a5ba625d145ef257491b4d41add2a0f5ad633 (patch)
tree29ae18079be877cedb14d9a61a31ea8b8c499f62
parentd2fdb78fa4dd4240ab0420c420e2208cc73893be (diff)
downloadanaconda-5e1a5ba625d145ef257491b4d41add2a0f5ad633.tar.gz
anaconda-5e1a5ba625d145ef257491b4d41add2a0f5ad633.tar.xz
anaconda-5e1a5ba625d145ef257491b4d41add2a0f5ad633.zip
2007-10-23 Jeremy Katz <katzj@redhat.com>
* liveinst/liveinst.sh (ANACONDA): Only use hal-lock if hal is running
-rw-r--r--ChangeLog2
-rw-r--r--liveinst/liveinst.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dfad9c47a..8e930fbc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-10-23 Jeremy Katz <katzj@redhat.com>
+ * liveinst/liveinst.sh (ANACONDA): Only use hal-lock if hal is running
+
* constants.py: Disable betanag
* anaconda (Anaconda): Fix for runinst with live images
diff --git a/liveinst/liveinst.sh b/liveinst/liveinst.sh
index d4f5a7f1d..609654138 100644
--- a/liveinst/liveinst.sh
+++ b/liveinst/liveinst.sh
@@ -37,7 +37,7 @@ if [ -x /usr/sbin/setenforce -a -e /selinux/enforce ]; then
/usr/sbin/setenforce 0
fi
-if [ -x /usr/bin/hal-lock ]; then
+if [ -x /usr/bin/hal-lock -a -e /var/run/subsys/haldaemon ]; then
/usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run "$ANACONDA"
else
$ANACONDA