diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2007-03-25 03:51:12 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2007-03-25 03:51:12 +0000 |
| commit | ef9f2a97995397f4d1a24b4d91d7ed919af65ecb (patch) | |
| tree | df324ad45b39eb3f6ba0d835ad8df6ee29c9d75b | |
| parent | fixing full-length package names in extra_packages (diff) | |
| download | gli-ef9f2a97995397f4d1a24b4d91d7ed919af65ecb.tar.gz gli-ef9f2a97995397f4d1a24b4d91d7ed919af65ecb.tar.bz2 gli-ef9f2a97995397f4d1a24b4d91d7ed919af65ecb.zip | |
force bootloader choice to grub in networkless mode. this is 0.5.1
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/branches/overhaul@1830 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | src/fe/gtk/Bootloader.py | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/src/fe/gtk/Bootloader.py b/src/fe/gtk/Bootloader.py index 5ca39ef..9346d10 100644 --- a/src/fe/gtk/Bootloader.py +++ b/src/fe/gtk/Bootloader.py @@ -38,26 +38,33 @@ partitions (this support for grub coming soon). vert = gtk.VBox(False, 0) vert.set_border_width(10) - self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()] - if self.controller.install_type != "networkless": - self.tmpbootloaders += self.bootloaders['none'] - - hbox = gtk.HBox(False) - label = gtk.Label() - label.set_markup('<b>Choose your bootloader</b>') - hbox.pack_start(label, expand=False, fill=False, padding=0) - vert.pack_start(hbox, expand=False, fill=False, padding=20) - - for bootloader in self.tmpbootloaders: - hbox = gtk.HBox(False, 0) - if bootloader == self.tmpbootloaders[0]: - self.radio_bootloaders[bootloader] = gtk.RadioButton(None, bootloader) - else: - self.radio_bootloaders[bootloader] = gtk.RadioButton(self.radio_bootloaders[self.tmpbootloaders[0]], bootloader) - self.radio_bootloaders[bootloader].set_name(bootloader) - self.radio_bootloaders[bootloader].connect("toggled", self.bootloader_selected, bootloader) - hbox.pack_start(self.radio_bootloaders[bootloader], expand=False, fill=False, padding=20) +# self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()] +# if self.controller.install_type != "networkless": +# self.tmpbootloaders += self.bootloaders['none'] + self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()] + self.bootloaders['none'] + if self.controller.install_type == "networkless": + hbox = gtk.HBox(False) + label = gtk.Label() + label.set_markup('<b>Your bootloader will be %s</b>' % self.tmpbootloaders[0]) + hbox.pack_start(label, expand=False, fill=False, padding=0) vert.pack_start(hbox, expand=False, fill=False, padding=20) + else: + hbox = gtk.HBox(False) + label = gtk.Label() + label.set_markup('<b>Choose your bootloader</b>') + hbox.pack_start(label, expand=False, fill=False, padding=0) + vert.pack_start(hbox, expand=False, fill=False, padding=20) + + for bootloader in self.tmpbootloaders: + hbox = gtk.HBox(False, 0) + if bootloader == self.tmpbootloaders[0]: + self.radio_bootloaders[bootloader] = gtk.RadioButton(None, bootloader) + else: + self.radio_bootloaders[bootloader] = gtk.RadioButton(self.radio_bootloaders[self.tmpbootloaders[0]], bootloader) + self.radio_bootloaders[bootloader].set_name(bootloader) + self.radio_bootloaders[bootloader].connect("toggled", self.bootloader_selected, bootloader) + hbox.pack_start(self.radio_bootloaders[bootloader], expand=False, fill=False, padding=20) + vert.pack_start(hbox, expand=False, fill=False, padding=20) # self.check_install_in_mbr = gtk.CheckButton("Install in MBR") # self.check_install_in_mbr.connect("toggled", self.mbr_selected) |