Permalink
Browse files

Shorten, but don't totally rename kernel and initrd files

  • Loading branch information...
1 parent d5596b5 commit 07dc67604d96b16ea8322102cf437928e0fcd144 Christian Hofstaedtler committed Dec 19, 2011
View
@@ -807,7 +807,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
# during build, so check for the file:
INITRD="$(ls $CHROOT_OUTPUT/boot/initrd* 2>/dev/null| grep -v '.bak$' | sort -r | head -1)"
if [ -n "$INITRD" ] ; then
- cp $INITRD "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"/initrd.gz
+ cp $INITRD "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"/initrd.img
find $CHROOT_OUTPUT/boot/ -name initrd\*.bak -exec rm {} \;
else
log "Error: No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting"
@@ -817,7 +817,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
KERNEL_IMAGE="$(ls $CHROOT_OUTPUT/boot/vmlinuz* 2>/dev/null | sort -r | head -1)"
if [ -n "$KERNEL_IMAGE" ] ; then
- cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"/linux26
+ cp "$KERNEL_IMAGE" "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"/vmlinuz
else
log "Error: No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting"
eerror "Error: No kernel found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1
@@ -1375,7 +1375,7 @@ create_netbootpackage() {
mkdir -p "$WORKING_DIR"
- cp "${CHROOT_OUTPUT}"/boot/vmlinuz-* "$WORKING_DIR"/linux26
+ cp "${CHROOT_OUTPUT}"/boot/vmlinuz-* "$WORKING_DIR"/vmlinuz
cp "${CHROOT_OUTPUT}"/boot/initrd.img-* "$WORKING_DIR"/initrd.img
cp "${CHROOT_OUTPUT}"/usr/lib/syslinux/pxelinux.0 "${WORKING_DIR}/pxelinux.0"
@@ -30,15 +30,15 @@ OUTPUTDIR="$(mktemp -d)" || exit 1
WORKING_DIR="${OUTPUTDIR}/grml_netboot_package_${GRML_VERSION}/tftpboot/"
mkdir -p "$WORKING_DIR" || exit 2
-cp "$CHROOT"/boot/vmlinuz-* "$WORKING_DIR"/linux26
+cp "$CHROOT"/boot/vmlinuz-* "$WORKING_DIR"/vmlinuz
cp "$CHROOT"/boot/initrd.img-* "$WORKING_DIR"/initrd.img
cp "$CHROOT"/usr/lib/syslinux/pxelinux.0 "${WORKING_DIR}/pxelinux.0"
mkdir -p "${WORKING_DIR}/pxelinux.cfg"
cat > "${WORKING_DIR}/pxelinux.cfg/default" << EOF
default grml
label grml
- kernel linux26
+ kernel vmlinuz
append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live apm=power-off quiet nomce noprompt noeject vga=791
EOF
@@ -26,8 +26,8 @@ fi
menuentry "%GRML_NAME% - release %VERSION% (default)" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Memory test (memtest86+)" {
@@ -88,56 +88,56 @@ menuentry "Boot OS of first partition on first disk" {
menuentry "%GRML_NAME% - enable persistent mode" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - copy Grml to RAM" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - copy whole medium to RAM" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - disable framebuffer" {
set gfxpayload=text
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
- initrd /boot/%SHORT_NAME%/initrd.gz
+ 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
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 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.gz
+ 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
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - debug mode" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc
+ initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "%GRML_NAME% - serial mode" {
set gfxpayload=text
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8
- initrd /boot/%SHORT_NAME%/initrd.gz
+ linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8
+ initrd /boot/%SHORT_NAME%/initrd.img
}
# EOF
@@ -2,8 +2,8 @@ default grml
label grml
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce
+ kernel /boot/%SHORT_NAME%/vmlinuz
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce
text help
Grml is a Debian based Linux live
@@ -4,8 +4,8 @@
label debug
menu label %GRML_NAME% - ^Debug Mode
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce
+ 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
text help
Boot Grml in debug mode, which
@@ -15,17 +15,17 @@ label debug
label nofb
menu label %GRML_NAME% - Dis^able Framebuffer
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce
+ 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
text help
Boot Grml without framebuffer.
endtext
label nokms
menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791
+ 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
text help
Boot Grml without KMS (Kernel
@@ -34,8 +34,8 @@ label nokms
label ssh
menu label %GRML_NAME% - Enable ^SSH (with random password)
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce ssh
+ kernel /boot/%SHORT_NAME%/vmlinuz
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce ssh
text help
Boot Grml and automatically start
@@ -48,8 +48,8 @@ label ssh
label forensic
menu label %GRML_NAME% - F^orensic Mode
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly
+ 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
text help
Boot Grml in forensic mode. This
@@ -61,17 +61,17 @@ label forensic
label lang-de
menu label %GRML_NAME% - ^German Settings
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce lang=de
+ kernel /boot/%SHORT_NAME%/vmlinuz
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce lang=de
text help
Boot Grml with german settings.
endtext
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce startx
+ kernel /boot/%SHORT_NAME%/vmlinuz
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce startx
text help
Boot Grml and automatically invoke
@@ -80,8 +80,8 @@ label %GRML_NAME%x
label grml2ram
menu label %GRML_NAME% - Load to ^RAM
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce toram=%SQUASHFS_NAME%
+ 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%
text help
Load Grml into the memory (RAM).
@@ -95,8 +95,8 @@ label grml2ram
label persistent
menu label %GRML_NAME% - ^Persistent mode
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles
+ kernel /boot/%SHORT_NAME%/vmlinuz
+ append initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles
text help
Boot Grml and enable persistency
@@ -107,8 +107,8 @@ label persistent
label serial
menu label %GRML_NAME% - Serial ^Console
- kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce console=tty1 console=ttyS0,9600n8
+ 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
text help
@@ -1,42 +1,42 @@
label splash
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% splash nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% splash nomce
label debian2hd
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce
+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
label debug
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% initcall_debug nomce
+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
label bootchart
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append init=/sbin/bootchartd apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+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
label grmlx
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce
label nofb
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+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
label nokms
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791
+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
-label linux26
+label vmlinuz
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce
label memtest
menu hide
@@ -45,28 +45,28 @@ append BOOT_IMAGE=memtest
label fb1280x1024
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce
label fb1024x768
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce
label fb800x600
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live bootid=%BOOTID% nomce
label serial
menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8
+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
label userdef
menu hide
menu hide
-kernel /boot/%SHORT_NAME%/linux26
+kernel /boot/%SHORT_NAME%/vmlinuz
append ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
label hda
@@ -2,7 +2,7 @@ default grml
label grml
menu DEFAULT
menu label %GRML_NAME% ^Standard (%VERSION%, %ARCH%)
- kernel linux26
+ 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
text help

0 comments on commit 07dc676

Please sign in to comment.