X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=624aa42d5341980271bffefc2e6a1ee5920ee9bb;hp=f06ab9a7a1aedeb34bc1367d789ceffa16bc47a0;hb=2ce757273c4a478b2699f8744a90604d6fea238e;hpb=e4a774796aafe18d465cc9d1891d56c3e8be5409

diff --git a/grml2usb b/grml2usb
index f06ab9a..624aa42 100755
--- a/grml2usb
+++ b/grml2usb
@@ -511,11 +511,10 @@ def install_grub(device):
             else:
                 grub_device = device
 
-            set_rw(device)
-            set_rw(grub_device)
-
             logging.info("Installing grub as bootloader")
             for opt in ["", "--force"]:
+                set_rw(device)
+                set_rw(grub_device)
                 logging.debug("grub-install --recheck %s --no-floppy --root-directory=%s %s",
                               opt, device_mountpoint, grub_device)
                 proc = subprocess.Popen([GRUB_INSTALL, "--recheck", opt,
@@ -715,8 +714,6 @@ def mount(source, target, mount_options):
         logging.debug("Source %s is not a device, therefore not mounting.", source)
         return 0
 
-    set_rw(source)
-
     logging.debug("mount %s %s %s", mount_options, source, target)
     proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target])
     proc.wait()
@@ -1030,6 +1027,9 @@ def copy_addons(iso_mount, target):
     # ipxe.lkrn
     handle_addon_copy('ipxe.lkrn', addons, iso_mount)
 
+    # netboot.xyz
+    handle_addon_copy('netboot.xyz.lkrn', addons, iso_mount)
+
 
 def build_loopbackcfg(target):
     """Generate GRUB's loopback.cfg based on existing config files.