From 205ad15b10bfdccfad61621ba3b4b7fef392c40f Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 22 Mar 2006 19:43:03 +0000 Subject: Create a dictionary in flags.py for storing /proc/cmdline. Nuke all references to /proc/cmdline from everywhere else in favor of this dict. --- partedUtils.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'partedUtils.py') 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)) -- cgit