From: Michael Prokop <mika@grml.org>
Date: Fri, 5 Jun 2020 11:28:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/88'
X-Git-Tag: v0.35.4~2
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=9fe94e84a80fc5eb449540d77367b19f5d7ed07b;hp=bfa5b78ec168028826cc280d3cc792392d7e72e4

Merge remote-tracking branch 'origin/github/pr/88'
---

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index d3a2193..623c413 100644
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -1,4 +1,12 @@
 submenu "%GRML_NAME% - advanced options  ->" --class=submenu {
+menuentry "%GRML_NAME% - Enable Predictable Network Interface Names" {
+    set gfxpayload=keep
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" 
+    echo 'Loading initrd...'
+    initrd /boot/%SHORT_NAME%/initrd.img
+}
+
 menuentry "%GRML_NAME% - enable persistency mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index dd19d4d..95dbc79 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -13,6 +13,15 @@ label debug
                                         bootup sequence.
   endtext
 
+label pnet
+  menu label %GRML_NAME% - Enable Predictable ^Network Interface Names
+  kernel /boot/%SHORT_NAME%/vmlinuz
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce 
+
+  text help
+                                        Boot Grml with Predictable Network Interface Names.
+  endtext
+
 label nofb
   menu label %GRML_NAME% - Dis^able Framebuffer
   kernel /boot/%SHORT_NAME%/vmlinuz