projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch default mount point from /lib/live/mount/medium to /run/live/medium
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
4fc9b37
..
1c906ab
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
2
# -*- coding: utf-8 -*-
# pylint: disable-msg=C0302
"""
# -*- coding: utf-8 -*-
# pylint: disable-msg=C0302
"""
@@
-7,7
+7,7
@@
grml2usb
This script installs a Grml system (either a running system or ISO[s]) to a USB device
This script installs a Grml system (either a running system or ISO[s]) to a USB device
-:copyright: (c) 2009
, 2010, 2011
by Michael Prokop <mika@grml.org>
+:copyright: (c) 2009
-2019
by Michael Prokop <mika@grml.org>
:license: GPL v2 or any later version
:bugreports: http://grml.org/bugs/
:license: GPL v2 or any later version
:bugreports: http://grml.org/bugs/
@@
-67,11
+67,12
@@
def grub_option(option, opt, value, opt_parser):
setattr(opt_parser.values, option.dest, True)
setattr(opt_parser.values, 'syslinux', False)
setattr(opt_parser.values, option.dest, True)
setattr(opt_parser.values, 'syslinux', False)
+
# cmdline parsing
# cmdline parsing
-USAGE = "Usage: %prog [options] <[ISO[s] | /
lib/live/mount
/medium]> </dev/sdX#>\n\
+USAGE = "Usage: %prog [options] <[ISO[s] | /
run/live
/medium]> </dev/sdX#>\n\
\n\
%prog installs Grml ISO[s] to an USB device to be able to boot from it.\n\
\n\
%prog installs Grml ISO[s] to an USB device to be able to boot from it.\n\
-Make sure you have at least one Grml ISO or a running Grml system (/
lib/live/mount
/medium),\n\
+Make sure you have at least one Grml ISO or a running Grml system (/
run/live
/medium),\n\
grub or syslinux and root access.\n\
\n\
Run %prog --help for usage hints, further information via: man grml2usb"
grub or syslinux and root access.\n\
\n\
Run %prog --help for usage hints, further information via: man grml2usb"
@@
-1226,7
+1227,7
@@
def identify_grml_flavour(mountpath):
version_files = search_file('grml-version', mountpath, lst_return=True)
if not version_files:
version_files = search_file('grml-version', mountpath, lst_return=True)
if not version_files:
- if mountpath.startswith("/
lib/live/mount
/medium"):
+ if mountpath.startswith("/
run/live
/medium"):
logging.critical("Error: could not find grml-version file.")
logging.critical("Looks like your system is running from RAM but required files are not available.")
logging.critical("Please either boot without toram=... or use boot option toram instead of toram=...")
logging.critical("Error: could not find grml-version file.")
logging.critical("Looks like your system is running from RAM but required files are not available.")
logging.critical("Please either boot without toram=... or use boot option toram instead of toram=...")
@@
-1627,7
+1628,7
@@
def install(image, device):
def install_grml(mountpoint, device):
"""Main logic for copying files of the currently running Grml system.
def install_grml(mountpoint, device):
"""Main logic for copying files of the currently running Grml system.
- @mountpoint: directory where currently running live system resides (usually /
lib/live/mount
/medium)
+ @mountpoint: directory where currently running live system resides (usually /
run/live
/medium)
@device: partition where the specified ISO should be installed to"""
device_mountpoint = device
@device: partition where the specified ISO should be installed to"""
device_mountpoint = device