diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-11-23 13:16:03 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-11-23 13:16:03 +0000 |
| commit | b790110599c6122e9146558f2f35642f69d071b7 (patch) | |
| tree | 484a9c02608a58eae26b7a854804f3948ef52507 | |
| parent | 03117aedf0ba3b5c549a0bbbdb0b9c944d8d6283 (diff) | |
| download | anaconda-b790110599c6122e9146558f2f35642f69d071b7.tar.gz anaconda-b790110599c6122e9146558f2f35642f69d071b7.tar.xz anaconda-b790110599c6122e9146558f2f35642f69d071b7.zip | |
(merge from rhel4-branch)
2004-11-23 Jeremy Katz <katzj@redhat.com>
* textw/upgrade_bootloader_text.py
(UpgradeBootloaderWindow.__call__): Set a default when we can't
determine the boot loader to avoid indeterminate state (#139603)
* lvm.py: Don't disable LVM if vgscan, et al segfault (#134263)
* packages.py (doPreInstall): Don't remove the directories as
they may not be empty (#133773)
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | lvm.py | 16 | ||||
| -rw-r--r-- | packages.py | 2 | ||||
| -rw-r--r-- | textw/upgrade_bootloader_text.py | 2 |
4 files changed, 27 insertions, 11 deletions
@@ -1,7 +1,23 @@ +2004-11-23 Jeremy Katz <katzj@redhat.com> + + * textw/upgrade_bootloader_text.py + (UpgradeBootloaderWindow.__call__): Set a default when we can't + determine the boot loader to avoid indeterminate state (#139603) + + * lvm.py: Don't disable LVM if vgscan, et al segfault (#134263) + + * packages.py (doPreInstall): Don't remove the directories as + they may not be empty (#133773) + +2004-11-22 Jeremy Katz <katzj@redhat.com> + + * loader2/init.c: Only open /dev/console once. + 2004-11-22 Paul Nasrat <pnasrat@redhat.com> * loader2/init.c: - Improved ppc console detection, based on notting's kudzu patch #135707 #134397 + Improved ppc console detection, based on notting's kudzu + patch #135707 (#134397) 2004-11-17 Jeremy Katz <katzj@redhat.com> @@ -65,8 +65,8 @@ def vgscan(): stderr = output, searchPath = 1) if rc: - log("running vgscan failed: %s. disabling lvm" %(rc,)) - lvmDevicePresent = 0 + log("running vgscan failed: %s" %(rc,)) +# lvmDevicePresent = 0 def vgactivate(volgroup = None): """Activate volume groups by running vgchange -ay. @@ -85,8 +85,8 @@ def vgactivate(volgroup = None): stderr = output, searchPath = 1) if rc: - log("running vgchange failed: %s. disabling lvm" %(rc,)) - lvmDevicePresent = 0 + log("running vgchange failed: %s" %(rc,)) +# lvmDevicePresent = 0 # now make the device nodes args = ["lvm", "vgmknodes"] @@ -97,8 +97,8 @@ def vgactivate(volgroup = None): stderr = output, searchPath = 1) if rc: - log("running vgmknodes failed: %s. disabling lvm" %(rc,)) - lvmDevicePresent = 0 + log("running vgmknodes failed: %s" %(rc,)) +# lvmDevicePresent = 0 def vgdeactivate(volgroup = None): """Deactivate volume groups by running vgchange -an. @@ -117,8 +117,8 @@ def vgdeactivate(volgroup = None): stderr = output, searchPath = 1) if rc: - log("running vgchange failed: %s. disabling lvm" %(rc,)) - lvmDevicePresent = 0 + log("running vgchange failed: %s" %(rc,)) +# lvmDevicePresent = 0 def lvremove(lvname, vgname): diff --git a/packages.py b/packages.py index ab000b0fd..d718ab487 100644 --- a/packages.py +++ b/packages.py @@ -681,7 +681,7 @@ def doPreInstall(method, id, intf, instPath, dir): if dir == DISPATCH_BACK: for d in ("/selinux", "/dev"): try: - isys.umount(instPath + d) + isys.umount(instPath + d, removeDir = 0) except Exception, e: log("unable to unmount %s: %s" %(d, e)) return diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py index fa91e086a..a332c8d1c 100644 --- a/textw/upgrade_bootloader_text.py +++ b/textw/upgrade_bootloader_text.py @@ -42,7 +42,7 @@ class UpgradeBootloaderWindow: if self.type is not None and self.bootDev is not None: update = 1 else: - nobl = 0 + nobl = 1 if self.type is not None and self.bootDev is not None: t = TextboxReflowed(53, |