X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=31da2ca438964709f34a4fc7d27875d3c178e4f6;hp=55f24bbb482db2175abee21af46c3f8bb1761c3d;hb=d9102415b982d630630ccd4747b83c981f93a61b;hpb=e1e094cbd8cda57a3dcf3ca627604d5459334b3f

diff --git a/grml2usb b/grml2usb
index 55f24bb..31da2ca 100755
--- a/grml2usb
+++ b/grml2usb
@@ -214,7 +214,7 @@ def mkfs_fat16(device):
     proc = subprocess.Popen(["mkfs.vfat", "-F", "16", device])
     proc.wait()
     if proc.returncode != 0:
-        raise Exception("error executing mkfs.vfat")
+        raise CriticalException("error executing mkfs.vfat")
 
 
 def generate_main_grub2_config(grml_flavour, install_partition, bootoptions):
@@ -233,13 +233,20 @@ set timeout=5
 
 insmod fat
 
-insmod png
-if background_image (hd0, %(install_partition)s)/boot/grub/grml.png ; then
+if font (hd0,%(install_partition)s)/boot/grub/ascii.pff ; then
+   insmod png
+   set gfxmode=640x480
+   insmod gfxterm
+   insmod vbe
+   terminal gfxterm
+fi
+
+if background_image (hd0,%(install_partition)s)/boot/grub/grml.png ; then
   set color_normal=black/black
-  set color_highlight=magenta/black
+  set color_highlight=red/black
 else
-  set menu_color_normal=cyan/blue
-  set menu_color_highlight=white/blue
+  set menu_color_normal=white/black
+  set menu_color_highlight=black/yellow
 fi
 
 menuentry "%(grml_flavour)s (default)" {
@@ -265,7 +272,7 @@ menuentry "FreeDOS" {
     initrd  /boot/addons/balder10.imz
 }
 
-menuentry "Boot Operating System on first partition of first disk" {
+menuentry "Boot OS of first partition on first disk" {
     set root=(hd0,1)
     chainloader +1
 }
@@ -342,7 +349,60 @@ menuentry "%(grml_flavour)s-serial" {
 """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
 
 
-def generate_grub1_config(grml_flavour, install_partition, bootoptions):
+def generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootoptions):
+    """Generate grub1 configuration for use via menu.lst
+
+    TODO
+
+    @grml_flavour: name of grml flavour the configuration should be generated for"""
+
+    local_datestamp = DATESTAMP
+
+    return("""\
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s2ram
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s toram=%(grml_flavour)s %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-debug
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s debug boot=live initcall_debug%(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-x
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s startx=wm-ng %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-nofb
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=ofonly %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-failsafe
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-forensic
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s nofstab noraid nolvm noautoconfig noswap raid=noautodetect %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+title %(grml_flavour)s-serial
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+
+""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
+
+
+def generate_main_grub1_config(grml_flavour, install_partition, bootoptions):
     """Generate grub1 configuration for use via menu.lst
 
     @grml_flavour: name of grml flavour the configuration should be generated for"""
@@ -350,19 +410,18 @@ def generate_grub1_config(grml_flavour, install_partition, bootoptions):
     local_datestamp = DATESTAMP
 
     return("""\
+## main grub1 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s]
 # misc options:
 timeout 30
 # color red/blue green/black
-splashimage=/boot/grub/splash.xpm.gz
+splashimage=(hd0,%(install_partition)s)/boot/grub/splash.xpm.gz
 foreground  = 000000
 background  = FFCC33
 
-# root=(hd0,%(install_partition)s)
-
 # define entries:
 title %(grml_flavour)s  - Default boot (using 1024x768 framebuffer)
-kernel /boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s
-initrd /boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s
+initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
 
 """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
 
@@ -503,8 +562,8 @@ def install_grub(device):
         register_tmpfile(device_mountpoint)
         try:
             mount(device, device_mountpoint, "")
-            logging.debug("grub-install --root-directory=%s %s", device_mountpoint, device)
-            proc = subprocess.Popen(["grub-install", "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
+            logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s", device_mountpoint, device)
+            proc = subprocess.Popen(["grub-install", "--recheck", "--no-floppy", "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
             proc.wait()
             if proc.returncode != 0:
                 raise Exception("error executing grub-install")
@@ -972,6 +1031,20 @@ def copy_bootloader_files(iso_mount, target):
                                 grub_target + 'splash.xpm.gz'])
         proc.wait()
 
+    # grml splash in grub
+    if os.path.isfile("/usr/share/grml2usb/grub/grml.png"):
+        logging.debug("cp /usr/share/grml2usb/grub/grml.png to %s" % grub_target + 'grml.png')
+        proc = subprocess.Popen(["install", "--mode=664", '/usr/share/grml2usb/grub/grml.png',
+                                grub_target + 'grml.png'])
+        proc.wait()
+
+    # font file for graphical bootsplash in grub
+    if os.path.isfile("/usr/share/grub/ascii.pff"):
+        logging.debug("cp /usr/share/grub/ascii.pff to %s" % grub_target + 'ascii.pff')
+        proc = subprocess.Popen(["install", "--mode=664", '/usr/share/grub/ascii.pff',
+                                grub_target + 'ascii.pff'])
+        proc.wait()
+
     if not os.path.isfile("/usr/share/grml2usb/grub/stage2_eltorito"):
         logging.critical("Error: /usr/share/grml2usb/grub/stage2_eltorito can not be read.")
         raise
@@ -1046,36 +1119,48 @@ def identify_grml_flavour(mountpath):
     return grml_flavour
 
 
-def handle_grub_config(grml_flavour, device, target):
-    """ TODO """
-
-    logging.debug("Generating grub configuration")
-    #with open("...", "w") as f:
-    #f.write("bla bla bal")
+def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt):
+    """TODO"""
 
-    grub_target = target + '/boot/grub/'
-    # should be present via copy_bootloader_files(), but make sure it exists:
-    execute(mkdir, grub_target)
-    # we have to adjust root() inside grub configuration
-    if device[-1:].isdigit():
-        install_partition = device[-1:]
+    # grub1 config
+    grub1_cfg = grub_target + 'menu.lst'
+    logging.debug("Creating grub1 configuration file (menu.lst)")
 
-    # do NOT write "None" in kernel cmdline
-    if options.bootoptions is None:
-        bootopt = ""
+    # install main configuration only *once*, no matter how many ISOs we have:
+    if os.path.isfile(grub1_cfg):
+        string = open(grub1_cfg).readline()
+        main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP)))
+        if not re.match(main_identifier, string):
+            grub1_config_file = open(grub1_cfg, 'w')
+            logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour)
+            grub1_config_file.write(generate_main_grub1_config(grml_flavour, install_partition, bootopt))
+            grub1_config_file.close()
     else:
-        bootopt = options.bootoptions
+        grub1_config_file = open(grub1_cfg, 'w')
+        grub1_config_file.write(generate_main_grub1_config(grml_flavour, install_partition, bootopt))
+        grub1_config_file.close()
+
+    grub_flavour_config = True
+    if os.path.isfile(grub1_cfg):
+        string = open(grub1_cfg).readlines()
+        logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
+        flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP))))
+        for line in string:
+            if flavour.match(line):
+                grub_flavour_config = False
+
+    if grub_flavour_config:
+        grub1_config_file = open(grub1_cfg, 'a')
+        grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt))
+        grub1_config_file.close( )
 
-    # grub1 config
-    #logging.debug("Creating grub1 configuration file")
-    #grub_config_file = open(grub_target + 'menu.lst', 'w')
-    #grub_config_file.write(generate_grub1_config(grml_flavour, install_partition, bootopt))
-    #grub_config_file.close()
-    # TODO => generate_main_grub1_config() && generate_flavour_specific_grub1_config()
+
+def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt):
+    """TODO"""
 
     # grub2 config
     grub2_cfg = grub_target + 'grub.cfg'
-    logging.debug("Creating grub2 configuration file")
+    logging.debug("Creating grub2 configuration file (grub.lst)")
 
     # install main configuration only *once*, no matter how many ISOs we have:
     if os.path.isfile(grub2_cfg):
@@ -1106,6 +1191,31 @@ def handle_grub_config(grml_flavour, device, target):
         grub2_config_file.close( )
 
 
+def handle_grub_config(grml_flavour, device, target):
+    """ TODO """
+
+    logging.debug("Generating grub configuration")
+
+    grub_target = target + '/boot/grub/'
+    execute(mkdir, grub_target)
+
+    # we have to adjust root() inside grub configuration
+    if device[-1:].isdigit():
+        install_grub1_partition = int(device[-1:]) - 1
+        install_grub2_partition = device[-1:]
+
+    # do NOT write "None" in kernel cmdline
+    if options.bootoptions is None:
+        bootopt = ""
+    else:
+        bootopt = options.bootoptions
+
+    # write menu.lst
+    handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt)
+    # write grub.cfg
+    handle_grub2_config(grml_flavour, install_grub2_partition, grub_target, bootopt)
+
+
 def handle_syslinux_config(grml_flavour, target):
     """ TODO
     """
@@ -1278,10 +1388,14 @@ def handle_vfat(device):
             sys.exit(1)
 
         # make sure the user is aware of what he is doing
-        f = raw_input("Are you sure you want to format the device with a fat16 filesystem? y/N ")
+        f = raw_input("Are you sure you want to format the specified partition with fat16? y/N ")
         if f == "y" or f == "Y":
             logging.info("Note: you can skip this question using the option --force")
-            mkfs_fat16(device)
+            try:
+                mkfs_fat16(device)
+            except CriticalException, error:
+                logging.critical("Execution failed: %s", error)
+                sys.exit(1)
         else:
             sys.exit(1)