help="install grub bootloader instead of (default) syslinux")
parser.add_option("--grub-mbr", dest="grubmbr", action="store_true",
help="install grub into MBR instead of (default) PBR")
-parser.add_option("--lilo-binary", dest="lilobin", action="store", type="string",
- help="lilo executable to be used for installing MBR")
parser.add_option("--mbr-menu", dest="mbrmenu", action="store_true",
help="enable interactive boot menu in MBR")
parser.add_option("--quiet", dest="quiet", action="store_true",
menuentry "%(grml_flavour)s (default)" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
return("""\
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s - boot in default mode" {
+menuentry "%(grml_flavour)s - boot in default mode" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-persistent - enable persistency feature" {
+menuentry "%(grml_flavour)s - enable persistent mode" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s2ram - copy compressed grml file to RAM" {
+menuentry "%(grml_flavour)s - copy Grml to RAM" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-debug - enable debugging options" {
+menuentry "%(grml_flavour)s - start X Window System" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug bootid=%(uid)s initcall_debug %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ startx bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-x - start X Window System" {
- set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng bootid=%(uid)s %(bootoptions)s
+menuentry "%(grml_flavour)s - disable framebuffer" {
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
+}
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s - disable Kernel Mode-Setting" {
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-nofb - disable framebuffer" {
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s
+menuentry "%(grml_flavour)s - forensic mode" {
+ set gfxpayload=1024x768x16,1024x768
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-failsafe - disable hardware detection" {
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi bootid=%(uid)s %(bootoptions)s
+menuentry "%(grml_flavour)s - disable hardware detection" {
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-forensic - do not touch harddisks during hw recognition" {
+menuentry "%(grml_flavour)s - enable debugging options" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ debug bootid=%(uid)s initcall_debug %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
sys.exit(1)
-def execute_lilo(lilo, device):
- """execute lilo for activating the partitions in the MBR
-
- @lilo: path of lilo executable
- @device: device where lilo should be executed on"""
-
- # to support -A for extended partitions:
- logging.info("Activating partitions in MBR via lilo")
- logging.debug("%s -S /dev/null -M %s ext", lilo, device)
- proc = subprocess.Popen([lilo, "-S", "/dev/null", "-M", device, "ext"])
- proc.wait()
- if proc.returncode != 0:
- raise Exception("error executing lilo")
-
- # activate partition:
- logging.debug("%s -S /dev/null -A %s 1", lilo, device)
- proc = subprocess.Popen([lilo, "-S", "/dev/null", "-A", device, "1"])
- proc.wait()
- if proc.returncode != 0:
- raise Exception("error executing lilo")
-
-
-def install_syslinux_mbr(device):
- """install syslinux's master boot record (MBR) on the specified device
-
- @device: device where MBR of syslinux should be installed to"""
-
- # make sure we have syslinux available
- if not which("syslinux") and not options.copyonly:
- raise Exception("syslinux not available (either install it or consider using the --grub option)")
-
- # lilo's mbr is broken, use the one from syslinux instead:
- if not os.path.isfile("/usr/lib/syslinux/mbr.bin"):
- raise Exception("/usr/lib/syslinux/mbr.bin can not be read")
-
- logging.info("Installing syslinux MBR")
- logging.debug("cat /usr/lib/syslinux/mbr.bin > %s", device)
- try:
- retcode = subprocess.call("cat /usr/lib/syslinux/mbr.bin > "+ device, shell=True)
- if retcode < 0:
- logging.critical("Error copying MBR to device (%s)", retcode)
- except OSError, error:
- logging.critical("Execution failed: %s", error)
-
-
-def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True):
+def install_mbr(mbrtemplate, device, partition, ismirbsdmbr=True):
"""install 'mbr' master boot record (MBR) on a device
Retrieve the partition table from "device", install an MBR from the
if not os.path.isfile(mbrtemplate):
logging.critical("Error: %s can not be read.", mbrtemplate)
- raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file?)")
+ raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file \"%s\"?)" % mbrtemplate)
- if (partition < 0) or (partition > 3):
- raise ValueError("partition must be between 0 and 3")
+ if partition is not None and ((partition < 0) or (partition > 3)):
+ logging.warn("Cannot activate partition %d" % partition)
+ partition = None
if ismirbsdmbr:
nmbrbytes = 439
if len(mbrcode) < 512:
raise EOFError("MBR size (%d) < 512" % len(mbrcode))
- if ismirbsdmbr:
- mbrcode = mbrcode[0:439] + chr(partition) + \
- mbrcode[440:510] + "\x55\xAA"
- else:
- actives = ["\x00", "\x00", "\x00", "\x00"]
- actives[partition] = "\x80"
- mbrcode = mbrcode[0:446] + actives[0] + \
- mbrcode[447:462] + actives[1] + \
- mbrcode[463:478] + actives[2] + \
- mbrcode[479:494] + actives[3] + \
- mbrcode[495:510] + "\x55\xAA"
-
+ if partition is not None:
+ if ismirbsdmbr:
+ mbrcode = mbrcode[0:439] + chr(partition) + \
+ mbrcode[440:510] + "\x55\xAA"
+ else:
+ actives = ["\x00", "\x00", "\x00", "\x00"]
+ actives[partition] = "\x80"
+ mbrcode = mbrcode[0:446] + actives[0] + \
+ mbrcode[447:462] + actives[1] + \
+ mbrcode[463:478] + actives[2] + \
+ mbrcode[479:494] + actives[3] + \
+ mbrcode[495:510] + "\x55\xAA"
+
tmpf.file.seek(0)
tmpf.file.truncate()
tmpf.file.write(mbrcode)
del tmpf
-def handle_syslinux_mbr(device):
- """Install syslinux master boot record on given device
-
- @device: device where MBR should be installed to"""
-
- if not is_writeable(device):
- raise IOError("device not writeable for user")
-
- # try to use system's lilo
- if which("lilo"):
- lilo = which("lilo")
- else:
- # otherwise fall back to our static version
- from platform import architecture
- if architecture()[0] == '64bit':
- lilo = GRML2USB_BASE + '/lilo/lilo.static.amd64'
- else:
- lilo = GRML2USB_BASE + '/lilo/lilo.static.i386'
- # finally prefer a specified lilo executable
- if options.lilobin:
- lilo = options.lilobin
-
- if not is_exe(lilo):
- raise Exception("lilo executable can not be execute")
-
- if options.dryrun:
- logging.info("Would install MBR running lilo and using syslinux.")
- return 0
-
- execute_lilo(lilo, device)
- install_syslinux_mbr(device)
-
-
def is_writeable(device):
"""Check if the device is writeable for the current user
grub_target = target + '/boot/grub/'
execute(mkdir, grub_target)
-
logo = search_file('logo.16', iso_mount)
exec_rsync(logo, syslinux_target + 'logo.16')
+ bootx64_efi = search_file('bootx64.efi', iso_mount)
+ if bootx64_efi:
+ mkdir(target + '/efi/boot/')
+ exec_rsync(bootx64_efi, target + '/efi/boot/bootx64.efi')
+
+ efi_img = search_file('efi.img', iso_mount)
+ if efi_img:
+ mkdir(target + '/boot/')
+ exec_rsync(efi_img, target + '/boot/efi.img')
for ffile in ['f%d' % number for number in range(1, 11) ]:
search_and_copy(ffile, iso_mount, syslinux_target + ffile)
logging.critical("Fatal: file default.cfg could not be found.")
logging.critical("Note: this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...")
logging.critical(" ... either use grml releases >=2009.10 or switch to an older grml2usb version.")
- logging.critical(" Please visit http://grml.org/grml2usb/#grml2usb-compat for further information.")
raise
for expr in name, 'distri.cfg', \
if device[-1:].isdigit():
mbr_device = re.match(r'(.*?)\d*$', device).group(1)
partition_number = int(device[-1:]) - 1
- skip_install_mir_mbr = False
+ else:
+ logging.warn("Could not detect partition number, not activating partition")
+ partition_number = None
# if we get e.g. /dev/loop1 as device we don't want to put the MBR
# into /dev/loop of course, therefore use /dev/loop1 as mbr_device
if mbr_device == "/dev/loop":
mbr_device = device
logging.info("Detected loop device - using %s as MBR device therefore", mbr_device)
- skip_install_mir_mbr = True
+
+ mbrcode = GRML2USB_BASE + '/mbr/mbrldr'
+ if options.syslinuxmbr:
+ mbrcode = '/usr/lib/syslinux/mbr.bin'
+ elif options.mbrmenu:
+ mbrcode = GRML2USB_BASE + '/mbr/mbrldr'
try:
- if options.syslinuxmbr:
- handle_syslinux_mbr(mbr_device)
- elif not skip_install_mir_mbr:
- if options.mbrmenu:
- install_mir_mbr(GRML2USB_BASE + '/mbr/mbrmgr', mbr_device, partition_number, True)
- else:
- install_mir_mbr(GRML2USB_BASE + '/mbr/mbrldr', mbr_device, partition_number, False)
+ install_mbr(mbrcode, mbr_device, partition_number, True)
except IOError, error:
logging.critical("Execution failed: %s", error)
sys.exit(1)
projects / grml2usb.git / blobdiff