summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-09-19 15:42:55 +0000
committerJeremy Katz <katzj@redhat.com>2007-09-19 15:42:55 +0000
commit481c96f7025eaa99eec896b88e5892544afd5245 (patch)
tree4d25c481e049ae5a227a160008c1073696726c67
parent90985c5cf5fd151875fb6ce5015bbb4fc2013f09 (diff)
downloadanaconda-481c96f7025eaa99eec896b88e5892544afd5245.tar.gz
anaconda-481c96f7025eaa99eec896b88e5892544afd5245.tar.xz
anaconda-481c96f7025eaa99eec896b88e5892544afd5245.zip
2007-09-19 Jeremy Katz <katzj@redhat.com>
* livecd.py (LiveCDImageMethod.unmountNonFstabDirs): Fix syntax error. * liveinst/liveinst.sh: Fix path.
-rw-r--r--ChangeLog6
-rw-r--r--livecd.py2
-rw-r--r--liveinst/liveinst.sh4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 56b79e29f..7bef714e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-19 Jeremy Katz <katzj@redhat.com>
+
+ * livecd.py (LiveCDImageMethod.unmountNonFstabDirs): Fix syntax error.
+
+ * liveinst/liveinst.sh: Fix path.
+
2007-09-18 Chris Lumens <clumens@redhat.com>
* anaconda.spec: Bump version.
diff --git a/livecd.py b/livecd.py
index 606723825..a8e6bb178 100644
--- a/livecd.py
+++ b/livecd.py
@@ -103,7 +103,7 @@ class LiveCDImageMethod(installmethod.InstallMethod):
dirs = ["/dev"]
if flags.selinux:
dirs.append("/selinux")
- for dir in dirs
+ for dir in dirs:
try:
isys.umount("%s/%s" %(anaconda.rootPath,dir), removeDir = 0)
except Exception, e:
diff --git a/liveinst/liveinst.sh b/liveinst/liveinst.sh
index 131ab2ddb..d4f5a7f1d 100644
--- a/liveinst/liveinst.sh
+++ b/liveinst/liveinst.sh
@@ -4,8 +4,8 @@
#
if [ -z "$LIVE_BLOCK" ]; then
- if [ -b "/dev/live-osimg-min" ]; then
- LIVE_BLOCK="/dev/live-osimg-min"
+ if [ -b "/dev/mapper/live-osimg-min" ]; then
+ LIVE_BLOCK="/dev/mapper/live-osimg-min"
else
LIVE_BLOCK="/dev/live-osimg"
fi