diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-03-22 19:43:03 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-03-22 19:43:03 +0000 |
| commit | 205ad15b10bfdccfad61621ba3b4b7fef392c40f (patch) | |
| tree | b0089a49f0f2b34d494f2b28ee43579a1406c959 /partedUtils.py | |
| parent | dc78bd8e55b9b59a40b023bbbb43393f38582288 (diff) | |
| download | anaconda-205ad15b10bfdccfad61621ba3b4b7fef392c40f.tar.gz anaconda-205ad15b10bfdccfad61621ba3b4b7fef392c40f.tar.xz anaconda-205ad15b10bfdccfad61621ba3b4b7fef392c40f.zip | |
Create a dictionary in flags.py for storing /proc/cmdline. Nuke all
references to /proc/cmdline from everywhere else in favor of this dict.
Diffstat (limited to 'partedUtils.py')
| -rw-r--r-- | partedUtils.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/partedUtils.py b/partedUtils.py index b8539930a..a8be5ea88 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -646,6 +646,9 @@ class DiskSet: self.startAllRaid() + if flags.cmdline.has_key("upgradeany"): + upgradeany = 1 + for dev, devices, level, numActive in self.mdList: (errno, msg) = (None, None) found = 0 @@ -660,10 +663,8 @@ class DiskSet: if found: if os.access (mountpoint + '/etc/fstab', os.R_OK): relstr = getReleaseString(mountpoint) - cmdline = open('/proc/cmdline', 'r').read() - - if ((cmdline.find("upgradeany") != -1) or - (upgradeany == 1) or + + if ((upgradeany == 1) or (productMatches(relstr, productName))): rootparts.append ((dev, fs, relstr)) isys.umount(mountpoint) @@ -688,10 +689,8 @@ class DiskSet: if found: if os.access (mountpoint + '/etc/fstab', os.R_OK): relstr = getReleaseString(mountpoint) - cmdline = open('/proc/cmdline', 'r').read() - if ((cmdline.find("upgradeany") != -1) or - (upgradeany == 1) or + if ((upgradeany == 1) or (productMatches(relstr, productName))): rootparts.append ((dev, fs, relstr)) isys.umount(mountpoint) @@ -725,10 +724,8 @@ class DiskSet: continue if os.access (mountpoint + '/etc/fstab', os.R_OK): relstr = getReleaseString(mountpoint) - cmdline = open('/proc/cmdline', 'r').read() - if ((cmdline.find("upgradeany") != -1) or - (upgradeany == 1) or + if ((upgradeany == 1) or (productMatches(relstr, productName))): rootparts.append ((node, part.fs_type.name, relstr)) |