Move squashfs into flavour-specific path

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/44-grub b/etc/grml/fai/config/scripts/GRMLBASE/44-grub
index 0aac0f1..9ba617a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/44-grub
+++ b/etc/grml/fai/config/scripts/GRMLBASE/44-grub
@@ -13,7 +13,7 @@ $ROOTCMD mkdir -p /boot/grub
 
 $ROOTCMD grub-mkimage -d /usr/lib/grub/i386-pc \
   -o /boot/grub/core.img \
 
 $ROOTCMD grub-mkimage -d /usr/lib/grub/i386-pc \
   -o /boot/grub/core.img \

-  biosdisk iso9660 \
+  biosdisk iso9660 fat \

   --format=i386-pc
 
 ## END OF FILE #################################################################
   --format=i386-pc
 
 ## END OF FILE #################################################################

diff --git a/grml-live b/grml-live
index 2fa42a8..bea6549 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -543,7 +543,7 @@ if [ -n "$EXTRACT_ISO_NAME" ]; then
     eend 1
     bailout 1
   fi
     eend 1
     bailout 1
   fi

-  unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*.squashfs ; rc=$?
+  unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*/*.squashfs ; rc=$?

   umount "$mountpoint"
   rmdir "$mountpoint"
   if [ "$rc" != 0 ]; then
   umount "$mountpoint"
   rmdir "$mountpoint"
   if [ "$rc" != 0 ]; then


@@ -1083,7 +1083,7 @@ elif [ -n "$SKIP_MKSQUASHFS" ] ; then
    log   "Skipping stage 'squashfs' as requested via option -q or -N"
    ewarn "Skipping stage 'squashfs' as requested via option -q or -N" ; eend 0
 else
    log   "Skipping stage 'squashfs' as requested via option -q or -N"
    ewarn "Skipping stage 'squashfs' as requested via option -q or -N" ; eend 0
 else

-   [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live
+   mkdir -p "$BUILD_OUTPUT"/live/"${GRML_NAME}"/

    # make sure we don't leave (even an empty) base.tgz:
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 
    # make sure we don't leave (even an empty) base.tgz:
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 


@@ -1132,11 +1132,11 @@ else
    [ -n "$SQUASHFS_INFO_MSG" ] && SQUASHFS_INFO_MSG="using options: $SQUASHFS_INFO_MSG"
    einfo "Squashfs build information: running binary $SQUASHFS_BINARY $SQUASHFS_INFO_MSG"
 
    [ -n "$SQUASHFS_INFO_MSG" ] && SQUASHFS_INFO_MSG="using options: $SQUASHFS_INFO_MSG"
    einfo "Squashfs build information: running binary $SQUASHFS_BINARY $SQUASHFS_INFO_MSG"
 

-   log "$SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS"
+   log "$SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/${GRML_NAME}/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS"

 
 

-   if $SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \
+   if $SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/"${GRML_NAME}"/"${GRML_NAME}".squashfs \

       -noappend $SQUASHFS_OPTIONS 2>"${SQUASHFS_STDERR}" ; then
       -noappend $SQUASHFS_OPTIONS 2>"${SQUASHFS_STDERR}" ; then

-      echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/filesystem.module
+      echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/"${GRML_NAME}"/filesystem.module

       log "Finished execution of stage 'squashfs' [$(date)]"
       einfo "Finished execution of stage 'squashfs'" ; eend 0
    else
       log "Finished execution of stage 'squashfs' [$(date)]"
       einfo "Finished execution of stage 'squashfs'" ; eend 0
    else

diff --git a/templates/boot/grub/%SHORT_NAME%_default.cfg b/templates/boot/grub/%SHORT_NAME%_default.cfg
index 72fbd54..b6d06a5 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 live-media-path=/live/%GRML_NAME%/ 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 32450b7..e7b917d 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 live-media-path=/live/%GRML_NAME%/ 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 live-media-path=/live/%GRML_NAME%/ 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 live-media-path=/live/%GRML_NAME%/ 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 live-media-path=/live/%GRML_NAME%/ 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,23 +34,23 @@ 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 live-media-path=/live/%GRML_NAME%/ 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
 }
 
 menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {

-echo 'Loading kernel...'

     set gfxpayload=keep
     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}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset

     echo 'Loading initrd...'
     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 

     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 live-media-path=/live/%GRML_NAME%/ 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 live-media-path=/live/%GRML_NAME%/ 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 live-media-path=/live/%GRML_NAME%/ 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
 }

diff --git a/templates/boot/isolinux/default.cfg b/templates/boot/isolinux/default.cfg
index 69c0dd4..eb562e2 100644 (file)
--- a/templates/boot/isolinux/default.cfg
+++ b/templates/boot/isolinux/default.cfg
@@ -3,7 +3,7 @@ label grml
   menu DEFAULT
   menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
   kernel /boot/%SHORT_NAME%/vmlinuz
   menu DEFAULT
   menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce 
+  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
                                         Grml is a Debian based Linux live
 
   text help
                                         Grml is a Debian based Linux live

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 5023669..a295d43 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -5,7 +5,7 @@
 label debug
   menu label %GRML_NAME% - ^Debug Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
 label debug
   menu label %GRML_NAME% - ^Debug Mode
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce 

 
   text help
                                         Boot Grml in debug mode, which
 
   text help
                                         Boot Grml in debug mode, which


@@ -16,7 +16,7 @@ label debug
 label nofb
   menu label %GRML_NAME% - Dis^able Framebuffer
   kernel /boot/%SHORT_NAME%/vmlinuz
 label nofb
   menu label %GRML_NAME% - Dis^able Framebuffer
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce 

 
   text help
                                         Boot Grml without framebuffer.
 
   text help
                                         Boot Grml without framebuffer.


@@ -25,7 +25,7 @@ label nofb
 label nokms
   menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
   kernel /boot/%SHORT_NAME%/vmlinuz
 label nokms
   menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791 

 
   text help
                                         Boot Grml without KMS (Kernel
 
   text help
                                         Boot Grml without KMS (Kernel


@@ -35,7 +35,7 @@ label nokms
 label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/vmlinuz
 label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce ssh
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce ssh

 
   text help
                                         Boot Grml and automatically start
 
   text help
                                         Boot Grml and automatically start


@@ -49,7 +49,7 @@ label ssh
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 

 
   text help
                                         Boot Grml in forensic mode. This
 
   text help
                                         Boot Grml in forensic mode. This


@@ -62,7 +62,7 @@ label forensic
 label lang-de
   menu label %GRML_NAME% - ^German Settings
   kernel /boot/%SHORT_NAME%/vmlinuz
 label lang-de
   menu label %GRML_NAME% - ^German Settings
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce lang=de 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce lang=de 

 
   text help
                                         Boot Grml with german settings.
 
   text help
                                         Boot Grml with german settings.


@@ -71,7 +71,7 @@ label lang-de
 label %GRML_NAME%x
   menu label %GRML_NAME% - Graphical ^Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
 label %GRML_NAME%x
   menu label %GRML_NAME% - Graphical ^Mode
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce startx
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce startx

 
   text help
                                         Boot Grml and automatically invoke
 
   text help
                                         Boot Grml and automatically invoke


@@ -81,7 +81,7 @@ label %GRML_NAME%x
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM
   kernel /boot/%SHORT_NAME%/vmlinuz
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce toram=%SQUASHFS_NAME% 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce toram=%SQUASHFS_NAME% 

 
   text help
                                         Load Grml into the memory (RAM).
 
   text help
                                         Load Grml into the memory (RAM).


@@ -96,7 +96,7 @@ label grml2ram
 label persistent
   menu label %GRML_NAME% - ^Persistent mode
   kernel /boot/%SHORT_NAME%/vmlinuz
 label persistent
   menu label %GRML_NAME% - ^Persistent mode
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles 

 
   text help
                                        Boot Grml and enable persistency
 
   text help
                                        Boot Grml and enable persistency


@@ -108,7 +108,7 @@ label persistent
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/vmlinuz
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/vmlinuz

-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce console=tty1 console=ttyS0,9600n8 

 
 
   text help
 
 
   text help

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index d1384e6..59de318 100644 (file)
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -1,42 +1,42 @@
 label splash
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 label splash
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% splash nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% splash nomce 

 
 label debian2hd
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label debian2hd
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce 

 
 label debug
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label debug
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% initcall_debug nomce 
+append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% initcall_debug nomce 

 
 label bootchart
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label bootchart
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append init=/sbin/bootchartd apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append init=/sbin/bootchartd apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label nofb
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label nofb
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
+append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 

 
 label nokms
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label nokms
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791 
+append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791 

 
 label vmlinuz
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label vmlinuz
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label memtest
 menu hide
 
 label memtest
 menu hide


@@ -46,22 +46,22 @@ append BOOT_IMAGE=memtest
 label fb1280x1024
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 label fb1280x1024
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label fb1024x768
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label fb1024x768
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label fb800x600
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label fb800x600
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce 
+append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce 

 
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
 
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz

-append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
+append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 

 
 label userdef
 menu hide
 
 label userdef
 menu hide

diff --git a/templates/boot/isolinux/netboot.cfg b/templates/boot/isolinux/netboot.cfg
index 33cecc7..fe4b490 100644 (file)
--- a/templates/boot/isolinux/netboot.cfg
+++ b/templates/boot/isolinux/netboot.cfg
@@ -3,7 +3,7 @@ label grml
   menu DEFAULT
   menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
   kernel vmlinuz
   menu DEFAULT
   menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
   kernel vmlinuz

-  append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live bootid=%BOOTID% apm=power-off nomce noprompt noeject vga=791 
+  append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce noprompt noeject vga=791 

 
   text help
                                         Grml is a Debian based Linux live
 
   text help
                                         Grml is a Debian based Linux live