projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c739163
)
Option --rw-blockdev: set r/w also in GRUB specific steps
author
Michael Prokop
<mika@grml.org>
Wed, 31 May 2017 09:19:49 +0000
(11:19 +0200)
committer
Michael Prokop
<mika@grml.org>
Wed, 31 May 2017 09:19:49 +0000
(11:19 +0200)
Thanks: Ralf Moll
grml2usb
patch
|
blob
|
history
diff --git
a/grml2usb
b/grml2usb
index
624aa42
..
e465ebe
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-502,8
+502,6
@@
def install_grub(device):
device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
register_tmpfile(device_mountpoint)
try:
device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
register_tmpfile(device_mountpoint)
try:
- mount(device, device_mountpoint, "")
-
# If using --grub-mbr then make sure we install grub in MBR instead of PBR
if options.grubmbr:
logging.debug("Using option --grub-mbr ...")
# If using --grub-mbr then make sure we install grub in MBR instead of PBR
if options.grubmbr:
logging.debug("Using option --grub-mbr ...")
@@
-511,6
+509,9
@@
def install_grub(device):
else:
grub_device = device
else:
grub_device = device
+ set_rw(device)
+ mount(device, device_mountpoint, "")
+
logging.info("Installing grub as bootloader")
for opt in ["", "--force"]:
set_rw(device)
logging.info("Installing grub as bootloader")
for opt in ["", "--force"]:
set_rw(device)
@@
-1593,6
+1594,8
@@
def install_grml(mountpoint, device):
check_for_fat(device)
if not options.skipbootflag:
check_boot_flag(device)
check_for_fat(device)
if not options.skipbootflag:
check_boot_flag(device)
+
+ set_rw(device)
mount(device, device_mountpoint, ['-o', 'utf8,iocharset=iso8859-1'])
except CriticalException as error:
mount(device, device_mountpoint, "")
mount(device, device_mountpoint, ['-o', 'utf8,iocharset=iso8859-1'])
except CriticalException as error:
mount(device, device_mountpoint, "")