Attachment 526060 Details for Bug 737731 – test patch

[patch] test patch

preupgrade.patch (text/plain), 1.07 KB, created by Richard Hughes on 2011-10-03 13:22:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Hughes

Created: 2011-10-03 13:22:04 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/preupgrade/__init__.py b/preupgrade/__init__.py
>index e742371..df58ab0 100644
>--- a/preupgrade/__init__.py
>+++ b/preupgrade/__init__.py
>@@ -585,7 +585,7 @@ class PreUpgrade(yum.YumBase):
>         ks = ['# ks.cfg generated by preupgrade',
>               'lang %s' % lang,
>               'keyboard %s' % keymap,
>-              'bootloader --upgrade --location=none',
>+              'bootloader',
>               'clearpart --none',
>               'upgrade',
>               'reboot',
>@@ -594,6 +594,11 @@ class PreUpgrade(yum.YumBase):
>               'grubby --remove-kernel=%s' % kernel,
>               'rm -rf %s /var/cache/yum/preupgrade*' % self.bootpath,
>               '%end\n']
>+        # Fedora 16 switched to grub2
>+        if float(self.conf.yumvar['releasever']) < 16.0 and float(self.target_version) >= 16.0:
>+            ks[3] += '  --location=mbr'
>+        else:
>+            ks[3] += '  --upgrade --location=none'
>         if float(self.target_version) > 10.0:
>             ks[5] += ' --root-device=UUID=%s' % dev.device_to_uuid('/dev/root')
>         f.write('\n'.join(ks))

Actions: View | Diff

Attachments on bug 737731: 524132 | 526060 | 526332 | 528916 | 564902