[Lunar-commits] <moonbase-core> Merge pull request #17 from Ratler/vmlinuz

[Auke Kok]

commit 90f6948d8fba5b92c3c67f6dd723c192f731a6ba
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Sat, 14 Jul 2012 13:36:37 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/90f6948d8fba5b92c3c67f6dd723c192f731a6ba

Merge pull request #17 from Ratler/vmlinuz

Kernel names now have vmlinuz as prefix. Also saving versioned configs in boot
---
  kernel/linux/BUILD                                           +3/-2     
  kernel/linux/POST_INSTALL                                    +1/-1     
  system/grub/plugin.d/bootloader-grub.plugin                  +4/-3     
  system/lilo/plugin.d/bootloader-lilo.plugin                  +4/-3     
  system/syslinux/plugin.d/bootloader-syslinux.plugin          +1/-1     
  5 files changed, 0 insertions (+), 0 deletions (-)

--- a/kernel/linux/BUILD
+++ b/kernel/linux/BUILD
@@ -18,7 +18,8 @@
   backup_mods_krnl $FULL_VERSION
   prepare_install
   make modules_install
-  cp arch/${MYARCH}/boot/bzImage /boot/$FULL_VERSION-`arch`
-  cp System.map /boot/System.map-$FULL_VERSION-`arch`
+  cp arch/${MYARCH}/boot/bzImage /boot/vmlinuz-$FULL_VERSION-$(arch)
+  cp System.map /boot/System.map-$FULL_VERSION-$(arch)
+  gzip -c -9 .config > /boot/config-$FULL_VERSION-$(arch).gz
 
 ) > $C_FIFO 2>&1
--- a/kernel/linux/POST_INSTALL
+++ b/kernel/linux/POST_INSTALL
@@ -1,7 +1,7 @@
 PATCH_VERSION=$(echo $VERSION | cut -d . -f 3)
 FULL_VERSION=$(echo $VERSION | cut -d . -f 1,2).${PATCH_VERSION:-0}
 
-update_bootloader $FULL_VERSION-`arch` $VERSION-`arch`
+update_bootloader $FULL_VERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 
--- a/system/grub/plugin.d/bootloader-grub.plugin
+++ b/system/grub/plugin.d/bootloader-grub.plugin
@@ -105,11 +105,12 @@ plugin_kernel_updatebootloader_grub()
 
   add_grub_image()
   {
+    local ARCH=$(arch)
     if ! has_grub_title "$2" /boot/grub/menu.lst ; then
-      print_grub_image "$1" "$2" >> /boot/grub/menu.lst.new
+      print_grub_image "vmlinuz-$1-$ARCH" "$2" >> /boot/grub/menu.lst.new
     fi
-    if [ -f /boot/"$1.old" ] && ! has_grub_title "$2.old" /boot/grub/menu.lst ; then
-      print_grub_image "$1.old" "$2.old" >> /boot/grub/menu.lst.new
+    if [ -f /boot/vmlinuz-$1-$ARCH.old ] && ! has_grub_title "$2.old" /boot/grub/menu.lst ; then
+      print_grub_image "vmlinuz-$1-$ARCH.old" "$2.old" >> /boot/grub/menu.lst.new
     fi
   }
 
--- a/system/lilo/plugin.d/bootloader-lilo.plugin
+++ b/system/lilo/plugin.d/bootloader-lilo.plugin
@@ -12,6 +12,7 @@
 
 
 plugin_kernel_updatebootloader_lilo() {
+  local ARCH=$(arch)
   # preferred? - master switch for experienced users
   if [ -n "$BOOTLOADER" -a "$BOOTLOADER" != "lilo" ]; then
     return 2
@@ -35,9 +36,9 @@ plugin_kernel_updatebootloader_lilo() {
         # rename this one to .old
         LABEL="    label = $2.old"
         SIMAGE=$(echo $IMAGE | tr -d '[:blank:]' | sed 's/image=//')
-        if [ "$SIMAGE" == "/boot/$1" ]; then
+        if [ "$SIMAGE" == "/boot/vmlinuz-$1-$ARCH" ]; then
           # rename the image too since the module moved it to .old
-          IMAGE="image = /boot/$1.old"
+          IMAGE="image = /boot/vmlinuz-$1-$ARCH.old"
         fi
       elif [ "$SLABEL" == "$2.old" ]; then
         # delete this one!
@@ -60,7 +61,7 @@ plugin_kernel_updatebootloader_lilo() {
     sed '/other\|image/Q' /etc/lilo.conf
 
     # we didn't have this label yet - insert it rightaway
-    echo "image = /boot/$1"
+    echo "image = /boot/vmlinuz-$1-$ARCH"
     echo "    label = $2"
     if [ -z "$READONLY" ]; then
       echo "    read-only"
--- a/system/syslinux/plugin.d/bootloader-syslinux.plugin
+++ b/system/syslinux/plugin.d/bootloader-syslinux.plugin
@@ -54,7 +54,7 @@ plugin_kernel_updatebootloader_syslinux() {
     if [ -z "$DONE" ]; then
       if echo "$LINE" | grep -q "^\s*label" ; then
         # insert
-        entry "$1" "$2" "$BOOTDIR" "$ROOTPART" >> $TMP
+        entry "vmlinuz-$1-$(arch)" "$2" "$BOOTDIR" "$ROOTPART" >> $TMP
         DONE="x"
       fi
     fi