grml2usb: handle_grub_config: stop moving bootid, live-media-path options

Author: zeha

grml2usb

@@ -1326,15 +1326,14 @@ def handle_grub_config(
             for line in fh.read().split("\n"):
                 line = line.rstrip("\r\n")
                 if option_re.search(line):
-                    line = bootid_re.sub("", line)
+                    line = bootid_re.sub(f"bootid={bootid}", line)
                     if shortname in filename:
-                        line = live_media_path_re.sub("", line)
-                        line = line.rstrip() + f" live-media-path=/live/{grml_flavour}/ "
+                        line = live_media_path_re.sub(f"live-media-path=/live/{grml_flavour}/", line)
                     if bootoptions.strip():
                         line = line.replace(f" {bootoptions.strip()} ", " ")
                         if line.endswith(bootoptions):
                             line = line[: -len(bootoptions)]
-                    line = line.rstrip() + f" bootid={bootid} {bootoptions} "
+                    line = line.rstrip() + f" {bootoptions} "
                     for regex in remove_regexes:
                         line = regex.sub(" ", line)
                 new_lines.append(line)

test/grml2usb_test.py

@@ -357,26 +357,26 @@ def test_remove_default_entry(tmp_path):
         (
             [],
             "",
-            'apm=power-off boot=live   "${loopback}" ${kernelopts} nomce '
-            "live-media-path=/live/grml-full-amd64/ bootid=BOOTID  ",
+            "apm=power-off boot=live live-media-path=/live/grml-full-amd64/ bootid=BOOTID "
+            '"${loopback}" ${kernelopts} nomce  ',
         ),
         (
             ["nomce"],
             "",
-            'apm=power-off boot=live   "${loopback}" ${kernelopts}   '
-            "live-media-path=/live/grml-full-amd64/ bootid=BOOTID  ",
+            "apm=power-off boot=live live-media-path=/live/grml-full-amd64/ bootid=BOOTID "
+            '"${loopback}" ${kernelopts}    ',
         ),
         (
             [],
             "nomce",
-            'apm=power-off boot=live   "${loopback}" ${kernelopts} '
-            "live-media-path=/live/grml-full-amd64/ bootid=BOOTID nomce ",
+            "apm=power-off boot=live live-media-path=/live/grml-full-amd64/ bootid=BOOTID "
+            '"${loopback}" ${kernelopts} nomce ',
         ),
         (
             [],
             "nomce noacpi",
-            'apm=power-off boot=live   "${loopback}" ${kernelopts} nomce '
-            "live-media-path=/live/grml-full-amd64/ bootid=BOOTID nomce noacpi ",
+            "apm=power-off boot=live live-media-path=/live/grml-full-amd64/ bootid=BOOTID "
+            '"${loopback}" ${kernelopts} nomce nomce noacpi ',
         ),
     ],
 )