include %(grml_flavour)s_grml.cfg
menu hide
menu end
-""" % {'grml_flavour': grml_flavour, 'display_name' : grml_flavour.replace('_', '-') } )
+""" % {'grml_flavour': grml_flavour, 'display_name' : get_flavour_filename(grml_flavour) } )
def install_grub(device):
execute(mkdir, conf_target)
return write_uuid(uuid_file_name)
+def get_shortname(grml_flavour):
+ """Get shortname based from grml_flavour name. The rules applied are the same as in grml-live
+ @grml_flavour: flavour name which shold be translated to shortname"""
+
+ return re.sub(r'[,._-]', '', grml_flavour)
def copy_system_files(grml_flavour, iso_mount, target):
"""copy grml's main files (like squashfs, kernel and initrd) to a given target
else:
exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
- cleaned_flavour = re.sub(r'[,._-]', '', grml_flavour)
- if os.path.isdir(iso_mount + '/boot/' + cleaned_flavour):
- exec_rsync(iso_mount + '/boot/' + cleaned_flavour, target + '/boot')
+ shortname = get_shortname(grml_flavour)
+ if os.path.isdir(iso_mount + '/boot/' + shortname):
+ exec_rsync(iso_mount + '/boot/' + shortname, target + '/boot')
else:
kernel = search_file('vmlinuz', iso_mount)
if kernel is None:
for regex in options.removeoption:
remove_regexes.append(re.compile(regex))
+ shortname = get_shortname(grml_flavour)
for filename in glob.glob(grub_target + '*.cfg'):
for line in fileinput.input(filename, inplace=1):
line = line.rstrip("\r\n")
if option_re.search(line):
line = bootid_re.sub('', line)
- line = live_media_path_re.sub('', line)
- line = line.rstrip() + r' live-media-path=/live/%s/ bootid=%s %s ' % (grml_flavour, UUID, bootopt)
+ if shortname in filename:
+ line = live_media_path_re.sub('', line)
+ line = line.rstrip() + ' live-media-path=/live/%s/ ' % (grml_flavour)
+ line = line.rstrip() + r' bootid=%s %s ' % (UUID, bootopt)
for regex in remove_regexes:
line = regex.sub(' ', line)
print line
@target: directory where the files are located
@filenames: list of filenames to alter
"""
- grml_filename = grml_flavour.replace('-', '_')
+ grml_filename = get_flavour_filename(grml_flavour)
for filename in filenames:
old_filename = "%s/%s" % (target, filename)
new_filename = "%s/%s_%s" % (target, grml_filename, filename)
prompt_name.close()
initial_syslinux_config(syslinux_target)
- flavour_filename = grml_flavour.replace('-', '_')
+ flavour_filename = get_flavour_filename(grml_flavour)
if search_file('default.cfg', syslinux_target):
modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg'])