projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use sys.stdout.write instead of print to prevent additional newlines
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
dfb6ef6
..
6ecc0aa
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-536,7
+536,7
@@
include options.cfg
include addons.cfg
label help
include addons.cfg
label help
- menu label S^yslinux prompt
+ include promptname.cfg
config prompt.cfg
text help
Jump to old style isolinux prompt
config prompt.cfg
text help
Jump to old style isolinux prompt
@@
-1119,7
+1119,7
@@
def copy_bootloader_files(iso_mount, target):
logo = search_file('logo.16', iso_mount)
exec_rsync(logo, syslinux_target + 'logo.16')
logo = search_file('logo.16', iso_mount)
exec_rsync(logo, syslinux_target + 'logo.16')
- for ffile in
'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10'
:
+ for ffile in
['f%d' % number for number in range(1,11) ]
:
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
@@
-1448,7
+1448,7
@@
def remove_default_entry(filename):
default_re = re.compile("^(\s*menu\s*default\s*)$", re.I)
for line in fileinput.input(filename, inplace=1):
if default_re.match(line): continue
default_re = re.compile("^(\s*menu\s*default\s*)$", re.I)
for line in fileinput.input(filename, inplace=1):
if default_re.match(line): continue
- print line
+ sys.stdout.write(line)
fileinput.close()
fileinput.close()
@@
-1479,6
+1479,10
@@
def handle_syslinux_config(grml_flavour, target):
syslinux_config_file.write("include vesamenu.cfg\n")
syslinux_config_file.close()
syslinux_config_file.write("include vesamenu.cfg\n")
syslinux_config_file.close()
+ prompt_name = open(syslinux_target + 'promptname.cfg', 'w')
+ prompt_name.write('menu label S^yslinux prompt\n')
+ prompt_name.close()
+
initial_syslinux_config(syslinux_target)
modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg'])
initial_syslinux_config(syslinux_target)
modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg'])