bring back legacy menu.lst for now

3 files changed, 31 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3d5bf4a4db9..ff40811310c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Apr  2 00:52:35 UTC 2017
+# Tue Apr  4 01:20:41 UTC 2017
 pkgbase = linux-linode
 	pkgdesc = Kernel for Linode servers
 	pkgver = 4.10.8
@@ -24,6 +24,7 @@ pkgbase = linux-linode
 	conflicts = grub-legacy
 	options = !strip
 	backup = etc/mkinitcpio.d/linux-linode.preset
+	backup = boot/grub/menu.lst
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.tar.sign
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.10.8.xz
@@ -33,6 +34,7 @@ pkgbase = linux-linode
 	source = 08_linux_linode
 	source = 98-linux-linode.hook
 	source = 99-grub-ll.hook
+	source = menu.lst
 	source = preset
 	sha512sums = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 	sha512sums = SKIP
@@ -43,6 +45,7 @@ pkgbase = linux-linode
 	sha512sums = 9b44b6df658e1fc70d630bca63216194024f74b8a508a07463f0fc4dcf27f4d76b5244002e039a46e15ee092f7fd31ddec7c5cece5513837f58493b1f9381702
 	sha512sums = c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f
 	sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
+	sha512sums = 2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210
 	sha512sums = 62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b
 
 pkgname = linux-linode
diff --git a/PKGBUILD b/PKGBUILD
index ff8a4faddf38..b85e06791df8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,6 +19,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
         '08_linux_linode'
         '98-linux-linode.hook'
         '99-grub-ll.hook'
+        'menu.lst'
         'preset')
 sha512sums=('c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90' 'SKIP'
             '9760254a63fea330e33b514dda457a3bf33da6f8e06c281fc3fb36ba4c022df8200d2a04d49f4acc9ce0c9f86cbfda7edc724431ed378be3288eb299510add2e' 'SKIP'
@@ -27,6 +28,7 @@ sha512sums=('c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab
             '9b44b6df658e1fc70d630bca63216194024f74b8a508a07463f0fc4dcf27f4d76b5244002e039a46e15ee092f7fd31ddec7c5cece5513837f58493b1f9381702'
             'c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f'
             'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
+            '2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210'
             '62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -36,7 +38,7 @@ pkgdesc="Kernel for Linode servers"
 depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'grub')
 provides=(linux)
 conflicts=(grub-legacy)
-backup=(etc/mkinitcpio.d/${pkgname}.preset)
+backup=(etc/mkinitcpio.d/${pkgname}.preset boot/grub/menu.lst)
 install=install
 
 prepare() {
@@ -91,4 +93,6 @@ package_linux-linode() {
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
   mkdir -p "${pkgdir}/usr"
   mv "${pkgdir}/"{lib,usr/}
+  mkdir -p ${pkgdir}/boot/grub
+  sed "s/%VER%/${pkgver}-${pkgrel}/ig" ${srcdir}/menu.lst > ${pkgdir}/boot/grub/menu.lst
 }
diff --git a/menu.lst b/menu.lst
new file mode 100644
index 000000000000..9e69aafe5610
--- /dev/null
+++ b/menu.lst
@@ -0,0 +1,22 @@
+default 0
+timeout 10
+
+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,errors=remount-ro swapaccount=0 kaslr
+initrd /boot/initramfs-linux-linode.img
+
+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,errors=remount-ro swapaccount=0 break=postmount verbose
+initrd /boot/initramfs-linux-linode.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,errors=remount-ro swapaccount=0 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,errors=remount-ro swapaccount=0 break=postmount verbose
+initrd /boot/initramfs-linux-fallback.img