summaryrefslogtreecommitdiffstats
path: root/upgrade.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-05-07 14:31:29 +0000
committerChris Lumens <clumens@redhat.com>2007-05-07 14:31:29 +0000
commit7ddb42502bcf9858b7cfc236a9754d81039b5d93 (patch)
treecf6594e83a2adddefa29f5c2930cdd408fc05b7f /upgrade.py
parent79a52032a01d022b35b94b7e935a3d21bfb79096 (diff)
downloadanaconda-7ddb42502bcf9858b7cfc236a9754d81039b5d93.tar.gz
anaconda-7ddb42502bcf9858b7cfc236a9754d81039b5d93.tar.xz
anaconda-7ddb42502bcf9858b7cfc236a9754d81039b5d93.zip
Back out fix from 2007-04-30 now that we have smarter activation/deactivation
code.
Diffstat (limited to 'upgrade.py')
-rw-r--r--upgrade.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/upgrade.py b/upgrade.py
index fc2b07f8f..2da1bc062 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -142,6 +142,7 @@ def mountRootPartition(anaconda, rootInfo, oldfsset, allowDirty = 0,
dirtyDevs = oldfsset.hasDirtyFilesystems(anaconda.rootPath)
if not allowDirty and dirtyDevs != []:
+ lvm.vgdeactivate()
diskset.stopMdRaid()
diskset.stopDmRaid()
diskset.stopMPath()
@@ -162,11 +163,6 @@ def mountRootPartition(anaconda, rootInfo, oldfsset, allowDirty = 0,
if rc == 0:
return -1
- # FIXME: diskset.getLabels() called from readFstab up above turns off LVM
- # so we have to call this yet again. Really need a better fix though.
- lvm.vgscan()
- lvm.vgactivate()
-
if flags.setupFilesystems:
oldfsset.mountFilesystems(anaconda, readOnly = readOnly)