projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0b0763c
)
Don't nag users about gpxe.lkrn
author
Christian Hofstaedtler
<ch@grml.org>
Sun, 15 May 2011 22:33:32 +0000
(
00:33
+0200)
committer
Christian Hofstaedtler
<ch@grml.org>
Sun, 15 May 2011 22:33:32 +0000
(
00:33
+0200)
grml2usb
patch
|
blob
|
history
diff --git
a/grml2usb
b/grml2usb
index
3fbf2c7
..
8987450
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-1230,16
+1230,18
@@
def copy_grml_files(iso_mount, target):
exec_rsync(grml_file, grml_webimg_target + myfile)
exec_rsync(grml_file, grml_webimg_target + myfile)
-def handle_addon_copy(filename, dst, iso_mount):
+def handle_addon_copy(filename, dst, iso_mount
, ignore_errors=False
):
"""handle copy of optional addons
@filename: filename of the addon
@dst: destination directory
@iso_mount: location of the iso mount
"""handle copy of optional addons
@filename: filename of the addon
@dst: destination directory
@iso_mount: location of the iso mount
+ @ignore_errors: don't report missing files
"""
file_location = search_file(filename, iso_mount)
if file_location is None:
"""
file_location = search_file(filename, iso_mount)
if file_location is None:
- logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
+ if not ignore_errors:
+ logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
else:
exec_rsync(file_location, dst)
else:
exec_rsync(file_location, dst)
@@
-1280,7
+1282,7
@@
def copy_addons(iso_mount, target):
handle_addon_copy('memtest', addons, iso_mount)
# gpxe.lkrn: got replaced by ipxe
handle_addon_copy('memtest', addons, iso_mount)
# gpxe.lkrn: got replaced by ipxe
- handle_addon_copy('gpxe.lkrn', addons, iso_mount)
+ handle_addon_copy('gpxe.lkrn', addons, iso_mount
, ignore_errors=True
)
# ipxe.lkrn
handle_addon_copy('ipxe.lkrn', addons, iso_mount)
# ipxe.lkrn
handle_addon_copy('ipxe.lkrn', addons, iso_mount)