fixes that actually boot

3 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d974577cce17..ce660efdb463 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,7 +39,7 @@ pkgbase = linux-linode
 	md5sums = 41c80f6c205457d4decddabb6937546b
 	md5sums = b24775bcf1d7a04c1d489af73c6e74b0
 	md5sums = 625481f015365febcd65aa136ee555f9
-	md5sums = 8539e1756666d404e3bbc083b5d43ced
+	md5sums = 901c03c685c65119b50666cb31a080be
 	md5sums = 3d6427cc412dbc226b5d058c82ba7c66
 	sha256sums = 78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649
 	sha256sums = SKIP
@@ -48,7 +48,7 @@ pkgbase = linux-linode
 	sha256sums = 895a3c713bce50b56c28cfd94c9d79e58dce0992a2ecfd040488d357940cf714
 	sha256sums = a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546
 	sha256sums = 368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3
-	sha256sums = cdb351170b2b3c7b29b397bb9edff6d7c4a9c9e0ef8794b0c081ab5d5a74a9f4
+	sha256sums = df9f20f818bf6c11296e5ac58c5fdd664ba17f3d80cf301eef9309ddb528741d
 	sha256sums = 33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44
 	sha512sums = ee6aeea84e8bba29d9521c97132340f8be6948f10e529084ae6bf405275ee88c4d5573efdbb6e98fd14707b892adcd5052f10204563ee5250beeb57c78451c4f
 	sha512sums = SKIP
@@ -57,7 +57,7 @@ pkgbase = linux-linode
 	sha512sums = 32378c67f48912e692597ea6dc2f2920b4a82c2a4a3a4ee0f60884efa5eb8c9bedb74d4b02bd6deab9a20c9beb3ed5254965a2905a66d79153e8f773495d8f4b
 	sha512sums = 1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7
 	sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
-	sha512sums = 2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210
+	sha512sums = 1a17f83747ebd2dbe8d57996a1234f9e72de0754f8907c984477d761c2d99753490b72d80e2c801b85ded705818d530401f6377e3312937d72d1e4052007ce30
 	sha512sums = a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f
 
 pkgname = linux-linode
diff --git a/PKGBUILD b/PKGBUILD
index 228d57eb7235..02002d5420d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,21 +26,21 @@ sha512sums=('ee6aeea84e8bba29d9521c97132340f8be6948f10e529084ae6bf405275ee88c4d5
             '32378c67f48912e692597ea6dc2f2920b4a82c2a4a3a4ee0f60884efa5eb8c9bedb74d4b02bd6deab9a20c9beb3ed5254965a2905a66d79153e8f773495d8f4b'
             '1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7'
             'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
-            '2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210'
+            '1a17f83747ebd2dbe8d57996a1234f9e72de0754f8907c984477d761c2d99753490b72d80e2c801b85ded705818d530401f6377e3312937d72d1e4052007ce30'
             'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f')
 sha256sums=('78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649' 'SKIP'
             '28fc2b18f1095131253bc82044c011048a30a4ec91d1ebdd0a9c5fc337fd523c' 'SKIP'
             '895a3c713bce50b56c28cfd94c9d79e58dce0992a2ecfd040488d357940cf714'
             'a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546'
             '368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3'
-            'cdb351170b2b3c7b29b397bb9edff6d7c4a9c9e0ef8794b0c081ab5d5a74a9f4'
+            'df9f20f818bf6c11296e5ac58c5fdd664ba17f3d80cf301eef9309ddb528741d'
             '33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44')
 md5sums=('6f4ab59d6ac7311f4245fc359706a0b7' 'SKIP'
          'be97cc48f18e5cb4b7df51eb868c3793' 'SKIP'
          '41c80f6c205457d4decddabb6937546b'
          'b24775bcf1d7a04c1d489af73c6e74b0'
          '625481f015365febcd65aa136ee555f9'
-         '8539e1756666d404e3bbc083b5d43ced'
+         '901c03c685c65119b50666cb31a080be'
          '3d6427cc412dbc226b5d058c82ba7c66')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -72,7 +72,7 @@ build() {
 package() {
   cd "${srcdir}/${_srcname}"
   local _kernver="$(<${srcdir}/version)"
-  local modulesdir="$pkgdir"/usr/lib/modules/$kernver
+  local modulesdir="$pkgdir"/usr/lib/modules/$_kernver
   mkdir -p "$modulesdir" "${pkgdir}"/boot/grub
   make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
   rm -rf "$modulesdir"/{source,build}
diff --git a/menu.lst b/menu.lst
index 9e69aafe5610..f48d527b0c82 100644
--- a/menu.lst
+++ b/menu.lst
@@ -3,20 +3,20 @@ 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
+kernel /boot/vmlinuz-linux-linode root=/dev/sda console=tty1 console=ttyS0 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
+kernel /boot/vmlinuz-linux-linode root=/dev/sda console=tty1 console=ttyS0 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
+kernel /boot/vmlinuz-linux root=/dev/sda console=tty1 console=ttyS0 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
+kernel /boot/vmlinuz-linux root=/dev/sda console=tty1 console=ttyS0 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