projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4608131
)
Support /media as mountpath (related to issue1127)
mika/media_path
author
Michael Prokop
<mika@grml.org>
Wed, 11 Jan 2012 12:55:30 +0000
(13:55 +0100)
committer
Michael Prokop
<mika@grml.org>
Wed, 11 Jan 2012 12:55:30 +0000
(13:55 +0100)
grml2iso.8.txt
patch
|
blob
|
history
grml2usb
patch
|
blob
|
history
diff --git
a/grml2iso.8.txt
b/grml2iso.8.txt
index
84a5146
..
f46df28
100644
(file)
--- a/
grml2iso.8.txt
+++ b/
grml2iso.8.txt
@@
-81,10
+81,10
@@
Create a new iso and remove existing boot parameters quiet and vga=791.
Create multiboot ISO /srv/grml.iso with grml_2009.05.iso and
grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.
Create multiboot ISO /srv/grml.iso with grml_2009.05.iso and
grml64-medium_2009.05.iso using /srv/git/grml2usb as grml2usb script.
- # WRKDIR=/m
nt/test/grml-tmp grml2iso -o /mnt
/test/grml.iso grml_2009.05.iso grml64_2009.05.iso
+ # WRKDIR=/m
edia/test/grml-tmp grml2iso -o /media
/test/grml.iso grml_2009.05.iso grml64_2009.05.iso
-Use /m
nt
/test/grml-tmp as working directory for creating the multiboot ISO
-/m
nt
/test/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.
+Use /m
edia
/test/grml-tmp as working directory for creating the multiboot ISO
+/m
edia
/test/grml.iso with grml_2009.05.iso and grml64_2009.05.iso.
# grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso
# grml2iso -p --skip-addons -o /srv/grml.iso /srv/grml-small_2009.10.iso /srv/grml64-small_2009.10.iso
diff --git
a/grml2usb
b/grml2usb
index
5ab3bf2
..
7b17c72
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-1536,7
+1536,8
@@
def handle_compat_warning(device):
@device: device that should be checked"""
# make sure we can replace old grml2usb script and warn user when using old way of life:
@device: device that should be checked"""
# make sure we can replace old grml2usb script and warn user when using old way of life:
- if device.startswith("/mnt/external") or device.startswith("/mnt/usb") and not options.force:
+ if device.startswith("/media/external") or device.startswith("/media/usb") or \
+ device.startswith("/mnt/external") or device.startswith("/mnt/usb") and not options.force:
print "Warning: the semantics of grml2usb has changed."
print "Instead of using grml2usb /path/to/iso %s you might" % device
print "want to use grml2usb /path/to/iso /dev/... instead."
print "Warning: the semantics of grml2usb has changed."
print "Instead of using grml2usb /path/to/iso %s you might" % device
print "want to use grml2usb /path/to/iso /dev/... instead."