/[gli]/branches/overhaul/src/fe/dialog/gli-dialog.py
Gentoo

Diff of /branches/overhaul/src/fe/dialog/gli-dialog.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1744 Revision 1745
1092 boot_device = self._install_profile.get_boot_device() 1092 boot_device = self._install_profile.get_boot_device()
1093 else: 1093 else:
1094 boot_device = "" 1094 boot_device = ""
1095 foundboot = False 1095 foundboot = False
1096 for mount in mounts: 1096 for mount in mounts:
1097 if not mount['devnode'][:-1] in boot_drive_choices: 1097 #if not mount['devnode'][:-1] in boot_drive_choices:
1098 boot_drive_choices.append(mount['devnode'][:-1]) 1098 # boot_drive_choices.append(mount['devnode'][:-1])
1099 mountpoint = mount['mountpoint'] 1099 mountpoint = mount['mountpoint']
1100 if (mountpoint == "/boot"): 1100 if (mountpoint == "/boot"):
1101 foundboot = True 1101 foundboot = True
1102 if (( (mountpoint == "/") and (not foundboot) ) or (mountpoint == "/boot")): 1102 if (( (mountpoint == "/") and (not foundboot) ) or (mountpoint == "/boot")):
1103 if not "doscsi" in kernel_params.split(): 1103 if not "doscsi" in kernel_params.split():
1104 if mount['devnode'].startswith("/dev/sd"): kernel_params += " doscsi" 1104 if mount['devnode'].startswith("/dev/sd"): kernel_params += " doscsi"
1105 for drive in self._drives:
1106 boot_drive_choices.append((drive, self._devices[drive].get_model()))
1105 arch_loaders = { 'x86': [ 1107 arch_loaders = { 'x86': [
1106 ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))], 1108 ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))],
1107 'amd64': [ 1109 'amd64': [
1108 ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))]} #FIXME ADD OTHER ARCHS 1110 ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))]} #FIXME ADD OTHER ARCHS
1109 if not self.networkless: 1111 if not self.networkless:
1848 configuration = open(filename ,"w") 1850 configuration = open(filename ,"w")
1849 configuration.write(self._install_profile.serialize()) 1851 configuration.write(self._install_profile.serialize())
1850 configuration.close() 1852 configuration.close()
1851 except: 1853 except:
1852 self._d.msgbox(_(u"Error. File couldn't be saved. Saving to /tmp/installprofile.xml instead.")) 1854 self._d.msgbox(_(u"Error. File couldn't be saved. Saving to /tmp/installprofile.xml instead."))
1855 else:
1856 filename = "/tmp/installprofile.xml"
1853 try: 1857 try:
1854 configuration = open("/tmp/installprofile.xml", "w") 1858 configuration = open("/tmp/installprofile.xml", "w")
1855 configuration.write(self._install_profile.serialize()) 1859 configuration.write(self._install_profile.serialize())
1856 configuration.close() 1860 configuration.close()
1857 except: 1861 except:
1875 self.set_install_stage() 1879 self.set_install_stage()
1876 self.set_portage_tree() 1880 self.set_portage_tree()
1877 self.try_steps(['unpack_stage_tarball', 'update_config_files', 'configure_make_conf','prepare_chroot','install_portage_tree']) 1881 self.try_steps(['unpack_stage_tarball', 'update_config_files', 'configure_make_conf','prepare_chroot','install_portage_tree'])
1878 def run_phase4(self): 1882 def run_phase4(self):
1879 self.set_make_conf() 1883 self.set_make_conf()
1884 self.set_etc_portage()
1880 self.set_distcc() 1885 self.set_distcc()
1881 self.try_steps(['update_config_files', 'configure_make_conf', 'stage1', 'stage2', 'install_distcc']) 1886 self.try_steps(['update_config_files', 'configure_make_conf', 'stage1', 'stage2', 'install_distcc'])
1882 1887
1883 self.set_root_password() 1888 self.set_root_password()
1884 self.set_timezone() 1889 self.set_timezone()

Legend:
Removed from v.1744  
changed lines
  Added in v.1745

  ViewVC Help
Powered by ViewVC 1.1.20