projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More consequently use "Grml" instead of "grml"
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
da6bfe0
..
0fbf339
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-5,7
+5,7
@@
grml2usb
~~~~~~~~
grml2usb
~~~~~~~~
-This script installs a
g
rml system (either a running system or ISO[s]) to a USB device
+This script installs a
G
rml system (either a running system or ISO[s]) to a USB device
:copyright: (c) 2009, 2010, 2011 by Michael Prokop <mika@grml.org>
:license: GPL v2 or any later version
:copyright: (c) 2009, 2010, 2011 by Michael Prokop <mika@grml.org>
:license: GPL v2 or any later version
@@
-170,13
+170,14
@@
def cleanup():
proc = subprocess.Popen(["sync"])
proc.wait()
proc = subprocess.Popen(["sync"])
proc.wait()
- for device in MOUNTED:
+ for device in MOUNTED
.copy()
:
try:
unmount(device, "")
try:
unmount(device, "")
- except RuntimeError:
+ logging.debug('Unmounted %s' % device)
+ except StandardError:
logging.debug('RuntimeError while umount %s, ignoring' % device)
logging.debug('RuntimeError while umount %s, ignoring' % device)
- for tmppath in TMPFILES:
+ for tmppath in TMPFILES
.copy()
:
try:
if os.path.isdir(tmppath) and not os.path.islink(tmppath):
# symbolic links to directories are ignored
try:
if os.path.isdir(tmppath) and not os.path.islink(tmppath):
# symbolic links to directories are ignored
@@
-188,7
+189,7
@@
def cleanup():
os.unlink(tmppath)
logging.debug('temporary file %s deleted' % tmppath)
unregister_tmpfile(tmppath)
os.unlink(tmppath)
logging.debug('temporary file %s deleted' % tmppath)
unregister_tmpfile(tmppath)
- except
Runtime
Error:
+ except
Standard
Error:
msg = 'RuntimeError while removing temporary %s, ignoring'
logging.debug(msg % tmppath)
msg = 'RuntimeError while removing temporary %s, ignoring'
logging.debug(msg % tmppath)
@@
-1495,7
+1496,7
@@
def install(image, device):
if options.force or os.path.exists(os.path.join(image, 'live')):
logging.info("Using %s as install base", image)
else:
if options.force or os.path.exists(os.path.join(image, 'live')):
logging.info("Using %s as install base", image)
else:
- q = raw_input("%s does not look like a
g
rml system. "
+ q = raw_input("%s does not look like a
G
rml system. "
"Do you really want to use this image? y/N " % image)
if q.lower() == 'y':
logging.info("Using %s as install base", image)
"Do you really want to use this image? y/N " % image)
if q.lower() == 'y':
logging.info("Using %s as install base", image)
@@
-1524,7
+1525,7
@@
def install(image, device):
def install_grml(mountpoint, device):
def install_grml(mountpoint, device):
- """Main logic for copying files of the currently running
g
rml system.
+ """Main logic for copying files of the currently running
G
rml system.
@mountpoint: directory where currently running live system resides (usually /lib/live/mount/medium)
@device: partition where the specified ISO should be installed to"""
@mountpoint: directory where currently running live system resides (usually /lib/live/mount/medium)
@device: partition where the specified ISO should be installed to"""
@@
-1815,7
+1816,7
@@
def main():
logging.info("Note: you can boot flavour %s using '%s' on the commandline.", flavour, flavour)
# finally be polite :)
logging.info("Note: you can boot flavour %s using '%s' on the commandline.", flavour, flavour)
# finally be polite :)
- logging.info("Finished execution of grml2usb (%s). Have fun with your
g
rml system.", PROG_VERSION)
+ logging.info("Finished execution of grml2usb (%s). Have fun with your
G
rml system.", PROG_VERSION)
except Exception, error:
logging.critical("Fatal: %s", str(error))
except Exception, error:
logging.critical("Fatal: %s", str(error))