Add trailing whitespace to grub commandline

diff --git a/templates/boot/grub/%SHORT_NAME%_default.cfg b/templates/boot/grub/%SHORT_NAME%_default.cfg
index bcbd665..72fbd54 100644 (file)
--- a/templates/boot/grub/%SHORT_NAME%_default.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_default.cfg
@@ -1,7 +1,7 @@
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux   /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce
+    linux   /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 

     echo 'Loading initrd...'
     initrd  /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd  /boot/%SHORT_NAME%/initrd.img
 }

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index 5e95124..32450b7 100644 (file)
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -2,7 +2,7 @@ submenu "%GRML_NAME% - advanced options  ->" --class=submenu {
 menuentry "%GRML_NAME% - enable persistent mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - enable persistent mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -10,7 +10,7 @@ menuentry "%GRML_NAME% - enable persistent mode" {
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -18,7 +18,7 @@ menuentry "%GRML_NAME% - copy Grml to RAM" {
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -26,7 +26,7 @@ menuentry "%GRML_NAME% - copy whole medium to RAM" {
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -34,7 +34,7 @@ menuentry "%GRML_NAME% - start X by default" {
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
     echo 'Loading kernel...'

-    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
+    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 initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -43,14 +43,14 @@ menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
 echo 'Loading kernel...'
     set gfxpayload=keep
     echo 'Loading initrd...'
 echo 'Loading kernel...'
     set gfxpayload=keep
     echo 'Loading initrd...'

-    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
+    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 

     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
+    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 initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -58,7 +58,7 @@ menuentry "%GRML_NAME% - forensic mode" {
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=keep
     echo 'Loading kernel...'

-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 

     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }


@@ -66,7 +66,7 @@ menuentry "%GRML_NAME% - debug mode" {
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
     echo 'Loading kernel...'
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
     echo 'Loading kernel...'

-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8
+    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 initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }