diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
| commit | d6ab17a42c932fa77919ba11aa73f09bfc715761 (patch) | |
| tree | f0280851561d310603846bdfdfb66b90f21c12bf /upgrade.py | |
| parent | bc0ab0a4e273708468c80d95ea9c9eab024797d6 (diff) | |
| download | anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.gz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.xz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.zip | |
(merges from f7-branch)
2007-05-30 Jeremy Katz <katzj@aglarond.local>
* isys/isys.py (_stopRaid): Fix raidstop. I have no clue how
things were working here...
* isys/isys.py (_getRaidInfo): raise ValueError when we don't find
a valid raid superblock (#151653).
* upgrade.py: More blacklist
* isys/isys.h (EARLY_SWAP_RAM): Let's bump RAM needs a little (#232862)
* iw/netconfig_dialog.py (NetworkConfigurator._handleIPError): Add
a frame so things look right
(NetworkConfigurator._ok): Set useipv4 to true, call netconfig
methods with the right args (#240804)
* network.py (hasActiveNetDev): Ensure we have an IP as
otherwise, the network device isn't really all that active.
Diffstat (limited to 'upgrade.py')
| -rw-r--r-- | upgrade.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upgrade.py b/upgrade.py index 9e430dd16..64583014a 100644 --- a/upgrade.py +++ b/upgrade.py @@ -40,10 +40,10 @@ log = logging.getLogger("anaconda") upgrade_remove_blacklist = [("system-config-mouse",), ("dev",)] if rhpl.getArch() == "x86_64": - upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386")] ) + upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386"), ("mkinitrd", "i386")] ) if rhpl.getArch() == "ppc": - upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64")] ) + upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64"), ("mkinitrd", "ppc64")] ) def queryUpgradeContinue(anaconda): if anaconda.dir == DISPATCH_FORWARD: |