USe prefix="grml2usb" for tmpfiles (thanks gebi), do not try copying addons for grml...

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 6978939..1470cb0 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -216,6 +216,10 @@ def mkfs_fat16(device):
     @device: partition that should be formated"""
 
     # syslinux -d boot/isolinux /dev/sdb1
+    if options.dryrun:
+        logging.info("Would execute mkfs.vfat -F 16 %s now.", device)
+        return 0
+
     logging.info("Formating partition with fat16 filesystem")
     logging.debug("mkfs.vfat -F 16 %s" % device)
     proc = subprocess.Popen(["mkfs.vfat", "-F", "16", device])
@@ -593,7 +597,7 @@ def install_grub(device):
     if options.dryrun:
         logging.info("Would execute grub-install [--root-directory=mount_point] %s now.", device)
     else:
-        device_mountpoint = tempfile.mkdtemp()
+        device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
         register_tmpfile(device_mountpoint)
         try:
             mount(device, device_mountpoint, "")
@@ -1027,7 +1031,8 @@ def copy_addons(iso_mount, target):
     # grub all-in-one image
     allinoneimg = search_file('allinone.img', iso_mount)
     if allinoneimg is None:
-        logging.warn("Warning: allinone.img not found - can not install it")
+        logging.warn("Warning: allinone.img not found - can not install it...")
+        logging.warn(" |-> that's fine if you don't need it - or are you using grml-small?")
     else:
         logging.debug("cp %s %s" % (allinoneimg, addons + '/allinone.img'))
         proc = subprocess.Popen(["cp", allinoneimg, addons + 'allinone.img'])
@@ -1036,7 +1041,8 @@ def copy_addons(iso_mount, target):
     # bsd imag
     bsdimg = search_file('bsd4grml', iso_mount)
     if bsdimg is None:
-        logging.warn("Warning: bsd4grml not found - can not install it")
+        logging.warn("Warning: bsd4grml not found - can not install it...")
+        logging.warn(" |-> that's fine if you don't need it - or are you using grml-small?")
     else:
         logging.debug("cp -a %s %s" % (bsdimg, addons + '/'))
         proc = subprocess.Popen(["cp", "-a", bsdimg, addons + '/'])
@@ -1045,7 +1051,8 @@ def copy_addons(iso_mount, target):
     # freedos image
     balderimg = search_file('balder10.imz', iso_mount)
     if balderimg is None:
-        logging.warn("Warning: balder10.imz not found - can not install it")
+        logging.warn("Warning: balder10.imz not found - can not install it...")
+        logging.warn(" |-> that's fine if you don't need it - or are you using grml-small?")
     else:
         logging.debug("cp %s %s" % (balderimg, addons + '/balder10.imz'))
         proc = subprocess.Popen(["cp", balderimg, addons + 'balder10.imz'])
@@ -1054,7 +1061,8 @@ def copy_addons(iso_mount, target):
     # memdisk image
     memdiskimg = search_file('memdisk', iso_mount)
     if memdiskimg is None:
-        logging.warn("Warning: memdisk not found - can not install it")
+        logging.warn("Warning: memdisk not found - can not install it...")
+        logging.warn(" |-> that's fine if you don't need it - or are you using grml-small?")
     else:
         logging.debug("cp %s %s" % (memdiskimg, addons + '/memdisk'))
         proc = subprocess.Popen(["cp", memdiskimg, addons + 'memdisk'])
@@ -1063,7 +1071,8 @@ def copy_addons(iso_mount, target):
     # memtest86+ image
     memtestimg = search_file('memtest', iso_mount)
     if memtestimg is None:
-        logging.warn("Warning: memtest not found - can not install it")
+        logging.warn("Warning: memtest not found - can not install it...")
+        logging.warn(" |-> that's fine if you don't need it - or are you using grml-small?")
     else:
         logging.debug("cp %s %s" % (memtestimg, addons + '/memtest'))
         proc = subprocess.Popen(["cp", memtestimg, addons + 'memtest'])
@@ -1131,7 +1140,6 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
     # * catch "install: .. No space left on device" & CO
 
     if options.dryrun:
-        logging.info("Would copy files to %s", iso_mount)
         return 0
     elif not options.bootloaderonly:
         logging.info("Copying files. This might take a while....")
@@ -1139,7 +1147,10 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
         copy_grml_files(iso_mount, target)
 
     if not options.skipaddons:
-        copy_addons(iso_mount, target)
+        if grml_flavour.endswith('-small'):
+            logging.info("grml-small doesn't provide any addons, not installing them therefor.")
+        else:
+            copy_addons(iso_mount, target)
 
     if not options.copyonly:
         copy_bootloader_files(iso_mount, target)
@@ -1244,6 +1255,7 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt):
         if not re.match(main_identifier, string):
             grub2_config_file = open(grub2_cfg, 'w')
             logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour)
+            grub_flavour_is_default = True
             grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, bootopt))
             grub2_config_file.close()
     else:
@@ -1262,7 +1274,9 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt):
 
     if grub_flavour_config:
         grub2_config_file = open(grub2_cfg, 'a')
-        logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
+        # display only if the grml flavour isn't the default
+        if not grub_flavour_is_default:
+            logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
         grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, install_partition, bootopt))
         grub2_config_file.close( )
 
@@ -1381,7 +1395,7 @@ def handle_iso(iso, device):
         logging.critical("TODO: /live/image handling not yet implemented - sorry")
         sys.exit(1)
 
-    iso_mountpoint = tempfile.mkdtemp()
+    iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
     register_tmpfile(iso_mountpoint)
     remove_iso_mountpoint = True
 
@@ -1402,7 +1416,7 @@ def handle_iso(iso, device):
         remove_device_mountpoint = False
         # skip_mbr = True
     else:
-        device_mountpoint = tempfile.mkdtemp()
+        device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
         register_tmpfile(device_mountpoint)
         remove_device_mountpoint = True
         try:
@@ -1436,9 +1450,13 @@ def handle_mbr(device):
 
     @device: device where the MBR should be installed to"""
 
+    if options.dryrun:
+        logging.info("Would install MBR")
+        return 0
+
     # make sure we have syslinux available
     if not options.skipmbr:
-        if not which("syslinux") and not options.copyonly and not options.dryrun:
+        if not which("syslinux") and not options.copyonly:
             logging.critical('Sorry, syslinux not available. Exiting.')
             logging.critical('Please install syslinux or consider using the --grub option.')
             sys.exit(1)