Attachment 484187 Details for Bug 646843 – preupgrade-cli.patch

[patch] preupgrade-cli.patch

0001-Add-optional-main-image-support-e49320d-to-preupgrad.patch (text/plain), 7.46 KB, created by James Laska on 2011-03-14 13:42:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2011-03-14 13:42:18 UTC

Size: 7.46 KB

patch

obsolete

>From 7c093b85cbf9c0ec96722c0f3959ce344b7f6c52 Mon Sep 17 00:00:00 2001
>From: root <root@test189.test.redhat.com>
>Date: Mon, 14 Mar 2011 09:11:51 -0400
>Subject: [PATCH] Add optional main image support (e49320d) to preupgrade-cli.py
>
>Along with adding support for Fedora 15 and newer releases that do not have a
>stage2 mainimage (install.img), this patch removes data/releases.txt which is
>no longer needed in the git repository.  The latest version of this file is
>available at http://mirrors.fedoraproject.org/releases.txt.
>---
> data/releases.txt |   93 -----------------------------------------------------
> preupgrade-cli.py |   42 ++++++++++++-----------
> 2 files changed, 22 insertions(+), 113 deletions(-)
> delete mode 100644 data/releases.txt
>
>diff --git a/data/releases.txt b/data/releases.txt
>deleted file mode 100644
>index aed58fd..0000000
>--- a/data/releases.txt
>+++ /dev/null
>@@ -1,93 +0,0 @@
>-# Example releases.list.
>-# The official version is here: http://mirrors.fedoraproject.org/releases.txt
>-#
>-# This file contains a list of available Fedora releases.
>-# Format is as follows:
>-#
>-#[Release Name] 
>-#   - Header for this release. Typically: [Fedora X (Codename)]
>-#version=FLOAT 
>-#   - Required. Version number for this release.
>-#stable=BOOL 
>-#   - Optional. Marks a release as stable/final. Defaults to false. 
>-#preupgrade-ok=BOOL
>-#   - Optional. Marks a release as usable with preupgrade. Defaults to false.
>-#eol-date=YYYYMMDD
>-#   - Optional. Gives the date on which the release stops getting updates.
>-#mirrorlist=URL
>-#   - Mirrorlist URL for the main repo for this release.
>-#baseurl=URL
>-#   - Single URL for the main repo for this release.
>-#installmirrorlist=URL
>-#   - Mirrorlist for the *installable tree* for this release
>-#     (i.e. this address needs an images/ dir and .treeinfo)
>-#installurl=URL
>-#   - Single URL for the installable tree.
>-#
>-# One of (mirrorlist or baseurl) is required. If those trees do not contain
>-# boot images (like Fedora 8's Everything tree) then an installurl or
>-# installmirrorlist is required.
>-
>-[Fedora 14 (Laughlin)]
>-stable=True
>-preupgrade-ok=True
>-version=14
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/14/Fedora/$basearch/os
>-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/14/$basearch/os
>-
>-[Fedora 13 (Goddard)]
>-stable=True
>-preupgrade-ok=True
>-version=13
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/13/Fedora/$basearch/os
>-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/13/$basearch/os
>-
>-[Fedora 12 (Constantine)]
>-stable=True
>-preupgrade-ok=True
>-version=12
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-12&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/12/Fedora/$basearch/os
>-
>-[Fedora 11 (Leonidas)]
>-stable=True
>-preupgrade-ok=True
>-version=11
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/11/Fedora/$basearch/os
>-
>-[Fedora 10 (Cambridge)]
>-stable=True
>-preupgrade-ok=True
>-version=10
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/10/Fedora/$basearch/os
>-eol-date=20091217
>-
>-# You can't reliably preupgrade to these.
>-# They're only here so we know when they've gone EOL.
>-
>-[Fedora 9 (Sulphur)]
>-stable=True
>-version=9
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/9/Fedora/$basearch/os
>-eol-date=20090703
>-
>-[Fedora 8 (Werewolf)]
>-stable=True
>-version=8
>-eol-date=20090107
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/8/Fedora/$basearch/os
>-
>-[Fedora 7 (Moonshine)]
>-stable=True
>-version=7
>-eol-date=20080613
>-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=$basearch
>-installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/7/Fedora/$basearch/os
>-
>-# vim: syntax=dosini
>diff --git a/preupgrade-cli.py b/preupgrade-cli.py
>index e4a0dab..67683fe 100755
>--- a/preupgrade-cli.py
>+++ b/preupgrade-cli.py
>@@ -212,27 +212,29 @@ class PreUpgradeCli(PreUpgrade, YumUtilBase):
> 
>         # Try to fetch stage2 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.generate_kickstart(extra_cmds=self.kickstart_cmds)
>+        # 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.generate_kickstart(extra_cmds=self.kickstart_cmds)
> 
>-            # download stage2.img
>-            stage2file = self.retrieve_non_critical_files()
>-            stage2_abs = self.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"
>-            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.")
>-            # FIXME: sleep here?
>-            self.errorprint(message)
>-            # We fall back to getting stage2 from instrepo
>-            stage2url = os.path.join(self.instrepo.urls[0], self.mainimage)
>-            extra_args += " stage2=" + stage2url
>+        # If a stage2.img exists, attempt to download it
>+        if self.mainimage is not None:
>+            try:
>+                # download stage2.img
>+                stage2file = self.retrieve_non_critical_files()
>+                stage2_abs = self.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"
>+                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.")
>+                # FIXME: sleep here?
>+                self.errorprint(message)
>+                # We fall back to getting stage2 from instrepo
>+                stage2url = os.path.join(self.instrepo.urls[0], self.mainimage)
>+                extra_args += " stage2=" + stage2url
> 
> 
>         # Step 3: Find out what packages we need to download
>-- 
>1.7.4.1
>

Actions: View | Diff

Attachments on bug 646843: 481921 | 481922 | 484187