diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2007-03-27 16:23:19 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2007-03-27 16:23:19 +0000 |
| commit | d67e88ab4d5ab7fb16a38cca38ebf30c547369b5 (patch) | |
| tree | f44a63fc77918877c70a497fa1047b4d32b37c3c | |
| parent | move swap activation code before empty mountpoint check (diff) | |
| download | gli-d67e88ab4d5ab7fb16a38cca38ebf30c547369b5.tar.gz gli-d67e88ab4d5ab7fb16a38cca38ebf30c547369b5.tar.bz2 gli-d67e88ab4d5ab7fb16a38cca38ebf30c547369b5.zip | |
add kernel arguments entry field and activate 'doscsi' detection code
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1838 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | src/fe/gtk/Bootloader.py | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/fe/gtk/Bootloader.py b/src/fe/gtk/Bootloader.py index 9346d10..304e3f6 100644 --- a/src/fe/gtk/Bootloader.py +++ b/src/fe/gtk/Bootloader.py @@ -85,15 +85,15 @@ partitions (this support for grub coming soon). # hbox.pack_start(self.boot_device_combo, expand=False, fill=False, padding=15) # vert.pack_start(hbox, expand=False, fill=False, padding=15) -# hbox = gtk.HBox(False, 0) -# tmplabel = gtk.Label("Extra kernel parameters:") -# tmplabel.set_alignment(0.0, 0.5) -# tmplabel.set_size_request(160, -1) -# hbox.pack_start(tmplabel, expand=False, fill=False, padding=0) -# self.kernel_params_entry = gtk.Entry() -# self.kernel_params_entry.set_width_chars(40) -# hbox.pack_start(self.kernel_params_entry, expand=False, fill=False, padding=15) -# vert.pack_start(hbox, expand=False, fill=False, padding=15) + hbox = gtk.HBox(False, 0) + tmplabel = gtk.Label("Extra kernel parameters:") + tmplabel.set_alignment(0.0, 0.5) + tmplabel.set_size_request(160, -1) + hbox.pack_start(tmplabel, expand=False, fill=False, padding=0) + self.kernel_params_entry = gtk.Entry() + self.kernel_params_entry.set_width_chars(40) + hbox.pack_start(self.kernel_params_entry, expand=False, fill=False, padding=15) + vert.pack_start(hbox, expand=False, fill=False, padding=30) self.add_content(vert) self.boot_devices = None @@ -115,7 +115,19 @@ partitions (this support for grub coming soon). self.controller.SHOW_BUTTON_BACK = False self.controller.SHOW_BUTTON_FORWARD = True self.active_selection = self.controller.install_profile.get_boot_loader_pkg() or self.tmpbootloaders[0] - self.radio_bootloaders[self.active_selection].set_active(True) + if self.controller.install_type != "networkless": + self.radio_bootloaders[self.active_selection].set_active(True) + kernel_params = self.controller.install_profile.get_bootloader_kernel_args() + if not "doscsi" in kernel_params.split(): + for mount in self.controller.install_profile.get_mounts(): + if not mount['device'].startswith("/dev/sd"): continue + if mount['mountpoint'] in ("/", "/boot"): + if kernel_params: + kernel_params = "doscsi" + else: + kernel_params += " doscsi" + break + self.kernel_params_entry.set_text(kernel_params) # self.check_install_in_mbr.set_active(self.controller.install_profile.get_boot_loader_mbr()) # self.boot_devices = self.controller.install_profile.get_partition_tables().keys() # self.boot_devices.sort() @@ -127,22 +139,13 @@ partitions (this support for grub coming soon). # self.boot_device_combo.set_active(i) # if self.boot_device_combo.get_active() == -1: # self.boot_device_combo.set_active(0) -# kernel_params = self.controller.install_profile.get_bootloader_kernel_args() -# if not "doscsi" in kernel_params.split(): -# parts_tmp = self.controller.install_profile.get_partition_tables() -# for device in parts_tmp: -# if not device.startswith("/dev/sda"): continue -# for part in parts_tmp[device]: -# if parts_tmp[device][part]['mountpoint'] == "/": -# kernel_params += " doscsi" -# self.kernel_params_entry.set_text(kernel_params) def next(self): self.controller.install_profile.set_boot_loader_pkg(None, self.active_selection, None) self.controller.install_profile.set_boot_loader_mbr(None, True, None) # if self.check_install_in_mbr.get_active(): # self.controller.install_profile.set_boot_device(None, self.boot_devices[self.boot_device_combo.get_active()], None) -# self.controller.install_profile.set_bootloader_kernel_args(None, self.kernel_params_entry.get_text(), None) + self.controller.install_profile.set_bootloader_kernel_args(None, self.kernel_params_entry.get_text(), None) progress = ProgressDialog(self.controller, ('install_bootloader', 'setup_and_run_bootloader' ), self.progress_callback) progress.run() |