Attachment 481922 Details for Bug 646843 – less-lazy-fix.patch

[patch] less-lazy-fix.patch

less-lazy.patch (text/plain), 4.50 KB, created by James Laska on 2011-03-02 18:04:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2011-03-02 18:04:45 UTC

Size: 4.50 KB

patch

obsolete

>diff --git a/preupgrade-gtk.py b/preupgrade-gtk.py
>index 4ed9a41..6efab5c 100755
>--- a/preupgrade-gtk.py
>+++ b/preupgrade-gtk.py
>@@ -490,28 +490,35 @@ class PreUpgradeGtk(PreUpgradeController):
> 
>         # Try to download stage2.img and write kickstart to /boot
>         extra_args = ""
>-        try:
>-            # TODO: make generate_kickstart cram the kickstart into initrd, so
>-            # /boot-less upgrades can still be automated
>-            # generate a kickstart file to automate the installation
>-            extra_args += " ks=%s" % self.pu.generate_kickstart()
>-
>-            # download stage2.img
>-            stage2file = self.pu.retrieve_non_critical_files()
>-            stage2_abs = self.pu.bootpath+"/"+stage2file
>-            bootdevpath = bootpath_to_anacondapath(stage2_abs, UUID=True)
>-            extra_args += " stage2=%s" % bootdevpath
>-        except PUError, e:
>-            # TODO: offer to create CD/copy stage2 to USB. bluh.
>-            message = str(e) + "\n\n"
>+
>+        # TODO: make generate_kickstart cram the kickstart into initrd, so
>+        # /boot-less upgrades can still be automated
>+        # generate a kickstart file to automate the installation
>+        extra_args += " ks=%s" % self.pu.generate_kickstart()
>+
>+        # If available, download the stage2 installation image
>+        if self.pu.mainimage is None:
>+            message = _("The main installer image could not be found.  This is not unexpected for newer releases.\nIt should be safe to proceed.")
>             print message
>-            message += _("The main installer image could not be saved to your hard drive. The installer can download this file once it starts, but this requires a wired network connection during installation.\n\nIf you do not have a wired network connection available, you should quit now.")
>-            response = continueQuitDialog(self.ui.assistant, message)
>-            if response == gtk.RESPONSE_NO:
>-                self.exit_instance(exitcode=1)
>-            # Fallback: let anaconda stage1 download stage2 from instrepo
>-            stage2url = os.path.join(self.pu.instrepo.urls[0], self.pu.mainimage)
>-            extra_args += " stage2=" + stage2url
>+
>+        else:
>+            try:
>+                # download stage2.img
>+                stage2file = self.pu.retrieve_non_critical_files()
>+                stage2_abs = self.pu.bootpath+"/"+stage2file
>+                bootdevpath = bootpath_to_anacondapath(stage2_abs, UUID=True)
>+                extra_args += " stage2=%s" % bootdevpath
>+            except PUError, e:
>+                # TODO: offer to create CD/copy stage2 to USB. bluh.
>+                message = str(e) + "\n\n"
>+                print message
>+                message += _("The main installer image could not be saved to your hard drive. The installer can download this file once it starts, but this requires a wired network connection during installation.\n\nIf you do not have a wired network connection available, you should quit now.")
>+                response = continueQuitDialog(self.ui.assistant, message)
>+                if response == gtk.RESPONSE_NO:
>+                    self.exit_instance(exitcode=1)
>+                # Fallback: let anaconda stage1 download stage2 from instrepo
>+                stage2url = os.path.join(self.pu.instrepo.urls[0], self.pu.mainimage)
>+                extra_args += " stage2=" + stage2url
> 
>         # Step 3: Find out what packages we need to download
>         self.progress.next_step()
>diff --git a/preupgrade/__init__.py b/preupgrade/__init__.py
>index b77499f..e74aee0 100644
>--- a/preupgrade/__init__.py
>+++ b/preupgrade/__init__.py
>@@ -416,9 +416,9 @@ class PreUpgrade(yum.YumBase):
>             self.kernel = cp.get(mysection, 'kernel')
>             self.initrd = cp.get(mysection, 'initrd')
>             if cp.has_section('stage2'):
>-                self.mainimage = cp.get('stage2', 'mainimage')
>+                self.mainimage = cp.get('stage2', 'mainimage', 'images/install.img')
>             else:
>-                self.mainimage = 'images/stage2.img'
>+                self.mainimage = None
>         except ConfigParser.NoOptionError, e:
>             raise PUError, _("Invalid treeinfo: %s") % str(e)
> 
>@@ -567,6 +567,7 @@ class PreUpgrade(yum.YumBase):
>             self._retrieve_file(item)
> 
>     def retrieve_non_critical_files(self, targetdir=''):
>+        assert self.mainimage is not None
>         extra_space = self.get_kernel_size()
>         self._retrieve_file(self.mainimage, targetdir, reserve_space=extra_space)
>         return os.path.basename(self.mainimage)

Actions: View | Diff

Attachments on bug 646843: 481921 | 481922 | 484187