boot from vanilla Arch kernel if available

3 files changed, 15 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ca240559b56..636d4f9d0aa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,7 @@ pkgbase = linux-linode
 	md5sums = 08cdcef928c2ca402adf1c444a3c43ac
 	md5sums = 610a6d51a0f206b5d51c901d600028f2
 	md5sums = cecbb4be919cccd052c87326837869a3
-	md5sums = d01f2350ec9f92e2eabcde0f11be24f2
+	md5sums = 9720a0d3d98f97231e5d7dec16ceb37b
 	md5sums = ee66f3cd0c5bc0ba0f65499784d19f30
 	md5sums = f3def2cefdcbb954c21d8505d23cc83c
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ad6ac48041e..e5a0d7e0af7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ md5sums=('1c738edfc54e7c65faeb90c436104e2f'
          '08cdcef928c2ca402adf1c444a3c43ac'
          '610a6d51a0f206b5d51c901d600028f2'
          'cecbb4be919cccd052c87326837869a3'
-         'd01f2350ec9f92e2eabcde0f11be24f2'
+         '9720a0d3d98f97231e5d7dec16ceb37b'
          'ee66f3cd0c5bc0ba0f65499784d19f30'
          'f3def2cefdcbb954c21d8505d23cc83c')
 pkgdesc="Kernel for Arch Linux on Linode"
diff --git a/menu.lst b/menu.lst
index 63725cdee28b..3705c1e61e6a 100644
--- a/menu.lst
+++ b/menu.lst
@@ -1,17 +1,27 @@
 default 0
 timeout 10
 
-title Arch Linux Linode Xen kernel %VER%
+title Linux-Linode %VER%
 root (hd0)
 kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro
 initrd /boot/initramfs-linux-linode.img
 
-title Arch Linux Linode Xen kernel %VER% - rescue-ish
+title Linux-Linode %VER% - rescue-ish
 root (hd0)
 kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
 initrd /boot/initramfs-linux-linode.img
 
-title Arch Linux Linode Xen kernel %VER% Fallback
+title Linux-Linode %VER% Fallback
 root (hd0)
 kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro
 initrd /boot/initramfs-linux-linode-fallback.img
+
+title Arch Vanilla %VER% (if installed)
+root (hd0)
+kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
+initrd /boot/initramfs-linux.img
+
+title Arch Vanilla %VER% Fallback (if installed)
+root (hd0)
+kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
+initrd /boot/initramfs-linux-fallback.img