From 3c90f8c3ae20fd2a69973bfc47ff6b208eb7ec59 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 27 Aug 2003 20:39:34 +0000 Subject: clean up bootdisk step skipping to be the same for install and upgrade, put the common code in floppy.py --- upgradeclass.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'upgradeclass.py') diff --git a/upgradeclass.py b/upgradeclass.py index 4a41ee041..ebb41d7f9 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -48,6 +48,13 @@ class InstallClass(BaseInstallClass): "complete" ) + if iutil.getArch() != "i386": + dispatch.skipStep("bootdisk") + else: + import floppy + if not floppy.hasFloppyDevice(): + dispatch.skipStep("bootdisk") + if iutil.getArch() != "i386" and iutil.getArch() != "x86_64": dispatch.skipStep("bootloader") dispatch.skipStep("bootloaderadvanced") -- cgit