X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2F%25SHORT_NAME%25_options.cfg;h=001fae9cc02ff2c8c62fb133bbbb423dda628ddd;hb=89c43982fb5056e25caada0e5018088ad4fcbae7;hp=db1d24f7ee82e1c00d6f2ad14e2cc262faeb6ba5;hpb=a9f099a853e5c4c02cdb031ed43c9633a69b6c08;p=grml-live.git

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index db1d24f..001fae9 100644
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -1,55 +1,81 @@
 submenu "%GRML_NAME% - advanced options  ->" --class=submenu {
-menuentry "%GRML_NAME% - enable persistent mode" {
+menuentry "%GRML_NAME% - enable Predictable Network Interface Names" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles
+    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...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} persistence 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} toram=%GRML_NAME%.squashfs 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} toram 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} startx 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly  radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+    echo 'Loading kernel...'
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=keep
-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
+    echo 'Loading kernel...'
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} read-only nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=keep
-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc
+    echo 'Loading kernel...'
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} initcall verbose debug=vc systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8
+    echo 'Loading kernel...'
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 }