/[smeserver]/rpms/anaconda/sme8/0007-Automatically-upgrade-bootloader-if-necessary.patch
ViewVC logotype

Contents of /rpms/anaconda/sme8/0007-Automatically-upgrade-bootloader-if-necessary.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.4 - (show annotations) (download)
Wed Apr 27 14:33:48 2011 UTC (13 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.3: +0 -0 lines
FILE REMOVED
Import of anaconda-11.1.2.224-1.el5.centos.1

1 From 01ba55cfe49ad96b5c4ed8d65b9ccefc339f2913 Mon Sep 17 00:00:00 2001
2 From: Shad L. Lords <slords@mail.com>
3 Date: Mon, 19 Oct 2009 08:16:24 -0600
4 Subject: [PATCH] Automatically upgrade bootloader if necessary
5
6 ---
7 textw/upgrade_bootloader_text.py | 91 ++++++++-----------------------------
8 1 files changed, 20 insertions(+), 71 deletions(-)
9
10 diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py
11 index 53f4c88..e23fd16 100644
12 --- a/textw/upgrade_bootloader_text.py
13 +++ b/textw/upgrade_bootloader_text.py
14 @@ -44,75 +44,24 @@ class UpgradeBootloaderWindow:
15 else:
16 nobl = 1
17
18 - if self.type is not None and self.bootDev is not None:
19 - t = TextboxReflowed(53,
20 - _("The installer has detected the %s boot "
21 - "loader currently installed on %s.")
22 - % (self.type, self.bootDev))
23 -
24 - self.update_radio = blradio.add(_("Update boot loader configuration"),
25 - "update", update)
26 + if nobl == 1:
27 + self.dispatch.skipStep("bootloadersetup", skip = 1)
28 + self.dispatch.skipStep("bootloader", skip = 1)
29 + self.dispatch.skipStep("bootloaderadvanced", skip = 1)
30 + self.dispatch.skipStep("instbootloader", skip = 1)
31 + elif newbl == 1:
32 + self.dispatch.skipStep("bootloadersetup", skip = 0)
33 + self.dispatch.skipStep("bootloader", skip = 1)
34 + self.dispatch.skipStep("bootloaderadvanced", skip = 1)
35 + self.dispatch.skipStep("instbootloader", skip = 0)
36 + self.bl.doUpgradeOnly = 0
37 else:
38 - t = TextboxReflowed(53,
39 - _("The installer is unable to detect the boot loader "
40 - "currently in use on your system."))
41 -
42 - self.update_radio = blradio.add(_("Update boot loader configuration"),
43 - "update", update)
44 - self.update_radio.w.checkboxSetFlags(FLAG_DISABLED, FLAGS_SET)
45 -
46 - self.nobl_radio = blradio.add(_("Skip boot loader updating"),
47 - "nobl", nobl)
48 - self.newbl_radio = blradio.add(_("Create new boot loader "
49 - "configuration"),
50 - "newbl", newbl)
51 -
52 - buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON])
53 -
54 - grid = GridFormHelp(screen, _("Upgrade Boot Loader Configuration"),
55 - "bl-upgrade", 1, 5)
56 -
57 - grid.add(t, 0, 0, (0,0,0,1))
58 - grid.add(self.update_radio, 0, 1, (0,0,0,0))
59 - grid.add(self.nobl_radio, 0, 2, (0,0,0,0))
60 - grid.add(self.newbl_radio, 0, 3, (0,0,0,1))
61 - grid.add(buttons, 0, 4, growx = 1)
62 -
63 -
64 - while 1:
65 - result = grid.run()
66 -
67 - button = buttons.buttonPressed(result)
68 -
69 - if button == TEXT_BACK_CHECK:
70 - screen.popWindow()
71 - return INSTALL_BACK
72 -
73 - if blradio.getSelection() == "nobl":
74 - self.dispatch.skipStep("bootloadersetup", skip = 1)
75 - self.dispatch.skipStep("bootloader", skip = 1)
76 - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
77 - self.dispatch.skipStep("instbootloader", skip = 1)
78 - elif blradio.getSelection() == "newbl":
79 - self.dispatch.skipStep("bootloadersetup", skip = 0)
80 - self.dispatch.skipStep("bootloader", skip = 0)
81 - self.dispatch.skipStep("bootloaderadvanced", skip = 0)
82 - self.dispatch.skipStep("instbootloader", skip = 0)
83 - self.bl.doUpgradeOnly = 0
84 - else:
85 - self.dispatch.skipStep("bootloadersetup", skip = 0)
86 - self.dispatch.skipStep("bootloader", skip = 1)
87 - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
88 - self.dispatch.skipStep("instbootloader", skip = 0)
89 - self.bl.doUpgradeOnly = 1
90 -
91 - if self.type == "GRUB":
92 - self.bl.useGrubVal = 1
93 - else:
94 - self.bl.useGrubVal = 0
95 - self.bl.setDevice(self.bootDev)
96 -
97 -
98 -
99 - screen.popWindow()
100 - return INSTALL_OK
101 + self.dispatch.skipStep("bootloadersetup", skip = 0)
102 + self.dispatch.skipStep("bootloader", skip = 1)
103 + self.dispatch.skipStep("bootloaderadvanced", skip = 1)
104 + self.dispatch.skipStep("instbootloader", skip = 0)
105 + self.bl.doUpgradeOnly = 1
106 + self.bl.useGrubVal = 1
107 + self.bl.setDevice(self.bootDev)
108 +
109 + return INSTALL_OK
110 --
111 1.5.5.6
112

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed