summaryrefslogtreecommitdiffstats
path: root/upgrade.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-24 23:05:15 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-24 23:05:15 +0000
commitc59f06fb68ca434863214c72ceee0eaebc92f937 (patch)
treeaf5c033dc8a7ec24f9d08446bc4bf2949294c2a1 /upgrade.py
parent2e687c5bbc0c07bda97c215be5dbc01c382d705f (diff)
downloadanaconda-c59f06fb68ca434863214c72ceee0eaebc92f937.tar.gz
anaconda-c59f06fb68ca434863214c72ceee0eaebc92f937.tar.xz
anaconda-c59f06fb68ca434863214c72ceee0eaebc92f937.zip
don't let people with duplicate labels continue upgrading (#97364)
Diffstat (limited to 'upgrade.py')
-rw-r--r--upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/upgrade.py b/upgrade.py
index db0bbef57..8339cbbc0 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -102,7 +102,7 @@ def mountRootPartition(intf, rootInfo, oldfsset, instPath, allowDirty = 0,
isys.mount(root, instPath, rootFs)
oldfsset.reset()
- newfsset = fsset.readFstab(instPath + '/etc/fstab')
+ newfsset = fsset.readFstab(instPath + '/etc/fstab', intf)
for entry in newfsset.entries:
oldfsset.add(entry)
@@ -308,7 +308,7 @@ def upgradeMountFilesystems(intf, rootInfo, oldfsset, instPath):
type="ok")
return DISPATCH_BACK
- newfsset = fsset.readFstab(instPath + '/etc/fstab')
+ newfsset = fsset.readFstab(instPath + '/etc/fstab', intf)
for entry in newfsset.entries:
oldfsset.add(entry)