X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml2usb;h=cb4d62132753a74e94438f7672eb36c0f43673dd;hb=cba6faf582b742821466653e4cec91735144e753;hp=708409bc066e5bd40faacd6ba7e297ccf0b92067;hpb=141d007585f1331fee9993d1fe46d251c89eb897;p=grml2usb.git diff --git a/grml2usb b/grml2usb index 708409b..cb4d621 100755 --- a/grml2usb +++ b/grml2usb @@ -26,8 +26,8 @@ MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg GRML_FLAVOURS = set() # which flavours are being installed? -global GRML_DEFAULT -global UUID +GRML_DEFAULT = None +UUID = None def syslinux_warning(option, opt, value, parser): sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " + @@ -1000,7 +1000,6 @@ def write_uuid(target_file): def get_uuid(target): - print 1111 conf_target = target + "/conf/" uuid_file_name = conf_target + "/bootid.txt" if os.path.isdir(conf_target): @@ -1919,6 +1918,9 @@ def handle_bootloader(device): def main(): """Main function [make pylint happy :)]""" + global GRML_FLAVOURS + global GRML_DEFAULT + global PROG_VERSION if options.version: print os.path.basename(sys.argv[0]) + " " + PROG_VERSION