projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Depend on rsync.
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
7fe8681
..
9e2b668
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-20,7
+20,7
@@
import fileinput
import glob
# global variables
import glob
# global variables
-PROG_VERSION = "0.9.1
5
"
+PROG_VERSION = "0.9.1
7-pre1
"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
@@
-1117,6
+1117,12
@@
def copy_addons(iso_mount, target):
else:
exec_rsync(memtestimg, addons + 'memtest')
else:
exec_rsync(memtestimg, addons + 'memtest')
+ # gpxe.lkrn
+ gpxeimg = search_file('gpxe.lkrn', iso_mount)
+ if gpxeimg is None:
+ logging.warn("Warning: gpxe.lkrn not found (that's fine if you don't need it)")
+ else:
+ exec_rsync(gpxeimg, addons + 'gpxe.lkrn')
def copy_bootloader_files(iso_mount, target):
"""copy grml's bootloader files to a given target
def copy_bootloader_files(iso_mount, target):
"""copy grml's bootloader files to a given target
@@
-1132,6
+1138,8
@@
def copy_bootloader_files(iso_mount, target):
for ffile in ['f%d' % number for number in range(1,11) ]:
bootsplash = search_file(ffile, iso_mount)
for ffile in ['f%d' % number for number in range(1,11) ]:
bootsplash = search_file(ffile, iso_mount)
+ if not bootsplash:
+ continue
exec_rsync(bootsplash, syslinux_target + ffile)
# avoid the "file is read only, overwrite anyway (y/n) ?" question
exec_rsync(bootsplash, syslinux_target + ffile)
# avoid the "file is read only, overwrite anyway (y/n) ?" question
@@
-1214,8
+1222,8
@@
def install_iso_files(grml_flavour, iso_mount, device, target):
sys.exit(1)
if not options.skipaddons:
sys.exit(1)
if not options.skipaddons:
- if
grml_flavour.endswith('-small'
):
- logging.info("
Note: grml-small doesn't provide any addons, not installing them therefore
.")
+ if
not search_file('addons', iso_mount
):
+ logging.info("
Could not find addons, therefore not installing
.")
else:
copy_addons(iso_mount, target)
else:
copy_addons(iso_mount, target)