/[gli]/trunk/src/templates/x86ArchitectureTemplate.py
Gentoo

Diff of /trunk/src/templates/x86ArchitectureTemplate.py

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

Revision 768 Revision 769
1""" 1"""
2Gentoo Linux Installer 2Gentoo Linux Installer
3 3
4$Id: x86ArchitectureTemplate.py,v 1.55 2005/07/22 21:24:22 codeman Exp $ 4$Id: x86ArchitectureTemplate.py,v 1.56 2005/07/30 19:44:28 codeman Exp $
5Copyright 2004 Gentoo Technologies Inc. 5Copyright 2004 Gentoo Technologies Inc.
6 6
7 7
8This fills in x86 specific functions. 8This fills in x86 specific functions.
9""" 9"""
403 root_device = device 403 root_device = device
404 if GLIUtility.is_file(root+file_name2): 404 if GLIUtility.is_file(root+file_name2):
405 exitstatus = GLIUtility.spawn("rm "+root+file_name2) 405 exitstatus = GLIUtility.spawn("rm "+root+file_name2)
406 exitstatus1 = GLIUtility.spawn("echo quit | "+ root+"/sbin/grub --device-map="+file_name2) 406 exitstatus1 = GLIUtility.spawn("echo quit | "+ root+"/sbin/grub --device-map="+file_name2)
407 exitstatus2 = GLIUtility.spawn("ls "+root+"/boot/kernel-* > "+file_name3) 407 exitstatus2 = GLIUtility.spawn("ls "+root+"/boot/kernel-* > "+file_name3)
408 if build_mode == "genkernel": 408 if build_mode == "genkernel" or self._install_profile.get_kernel_source_pkg() == "livecd-kernel":
409 exitstatus3 = GLIUtility.spawn("ls "+root+"/boot/initramfs-* > "+file_name4) 409 exitstatus3 = GLIUtility.spawn("ls "+root+"/boot/initramfs-* > "+file_name4)
410 else: 410 else:
411 exitstatus3 = GLIUtility.spawn("touch "+file_name4) 411 exitstatus3 = GLIUtility.spawn("touch "+file_name4)
412 if (exitstatus1 != 0) or (exitstatus2 != 0) or (exitstatus3 != 0): 412 if (exitstatus1 != 0) or (exitstatus2 != 0) or (exitstatus3 != 0):
413 raise GLIException("BootloaderError", 'fatal', '_configure_grub', "Error in one of THE THREE run commands") 413 raise GLIException("BootloaderError", 'fatal', '_configure_grub', "Error in one of THE THREE run commands")
458 else: #we have / and /boot needs to be included 458 else: #we have / and /boot needs to be included
459 newgrubconf += "splashimage=(" + grub_boot_drive + "," + grub_boot_minor + ")/boot/grub/splash.xpm.gz\n" 459 newgrubconf += "splashimage=(" + grub_boot_drive + "," + grub_boot_minor + ")/boot/grub/splash.xpm.gz\n"
460 460
461 newgrubconf += "title=Gentoo Linux\n" 461 newgrubconf += "title=Gentoo Linux\n"
462 newgrubconf += "root (" + grub_boot_drive + "," + grub_boot_minor + ")\n" 462 newgrubconf += "root (" + grub_boot_drive + "," + grub_boot_minor + ")\n"
463 if build_mode != "genkernel": #using CUSTOM kernel 463 if build_mode != "genkernel" and self._install_profile.get_kernel_source_pkg() != "livecd-kernel": #using CUSTOM kernel
464 if foundboot: 464 if foundboot:
465 newgrubconf += "kernel " + grub_kernel_name[5:] + " root="+root_device+root_minor+"\n" 465 newgrubconf += "kernel " + grub_kernel_name[5:] + " root="+root_device+root_minor+"\n"
466 else: 466 else:
467 newgrubconf += "kernel /boot"+ grub_kernel_name[5:] + " root="+root_device+root_minor+"\n" 467 newgrubconf += "kernel /boot"+ grub_kernel_name[5:] + " root="+root_device+root_minor+"\n"
468 else: #using genkernel so it has an initrd. 468 else: #using genkernel so it has an initrd.

Legend:
Removed from v.768  
changed lines
  Added in v.769

  ViewVC Help
Powered by ViewVC 1.1.20