aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar2017-04-03 20:31:23 -0700
committeryar2017-04-03 22:40:58 -0700
commita50d1d41ea347a52adc9a3e945dc3f1b2ce83e74 (patch)
tree1a183383b1651577e3cf470522a28781d3c909c7
parent0dedd0bc3fbe7094926d8dfb2ebcd3fd63ff7478 (diff)
downloadaur-a50d1d41ea347a52adc9a3e945dc3f1b2ce83e74.tar.gz
update readme
also fix hash and bump pkgver
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--README.md27
3 files changed, 26 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ff40811310c9..1ed139029a9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Apr 4 01:20:41 UTC 2017
+# Tue Apr 4 03:55:11 UTC 2017
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
pkgver = 4.10.8
- pkgrel = 8
+ pkgrel = 9
url = https://github.com/yardenac/linux-linode
install = install
arch = i686
@@ -42,7 +42,7 @@ pkgbase = linux-linode
sha512sums = SKIP
sha512sums = 666a8d4bebb4f2b841b405a7eb25ae827efdbafa7468817077e145690c933ce4c681bc59b3129427e61a3c573dd065872d7cecc1c07119615f816b6572f6c6ea
sha512sums = a298f48d643a7b67de0308549eca38090af2e4d2003334a3b8ba163edc6f55625af359de2130cb52ee04e1aaab634b0b8e225a9dfa07c98e68a3ab68c073b9c5
- sha512sums = 9b44b6df658e1fc70d630bca63216194024f74b8a508a07463f0fc4dcf27f4d76b5244002e039a46e15ee092f7fd31ddec7c5cece5513837f58493b1f9381702
+ sha512sums = 7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d
sha512sums = c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f
sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
sha512sums = 2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210
diff --git a/PKGBUILD b/PKGBUILD
index b85e06791df8..9f5a6e832248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _basekernel=4.10
_kernelname=${pkgname#linux}
_srcname=linux-${_basekernel}
pkgver=${_basekernel}.8
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url="https://github.com/yardenac/linux-linode"
license=(GPL2)
@@ -25,7 +25,7 @@ sha512sums=('c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab
'9760254a63fea330e33b514dda457a3bf33da6f8e06c281fc3fb36ba4c022df8200d2a04d49f4acc9ce0c9f86cbfda7edc724431ed378be3288eb299510add2e' 'SKIP'
'666a8d4bebb4f2b841b405a7eb25ae827efdbafa7468817077e145690c933ce4c681bc59b3129427e61a3c573dd065872d7cecc1c07119615f816b6572f6c6ea'
'a298f48d643a7b67de0308549eca38090af2e4d2003334a3b8ba163edc6f55625af359de2130cb52ee04e1aaab634b0b8e225a9dfa07c98e68a3ab68c073b9c5'
- '9b44b6df658e1fc70d630bca63216194024f74b8a508a07463f0fc4dcf27f4d76b5244002e039a46e15ee092f7fd31ddec7c5cece5513837f58493b1f9381702'
+ '7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d'
'c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f'
'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
'2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210'
diff --git a/README.md b/README.md
index 97cac4d71b8d..d3e247422177 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,28 @@ This package provides a working, semi-minimalist kernel. It boots and is fine to
Configs are a compromise between vanilla Linode and Arch. Most drivers are disabled, while a lot of ciphers and net stuff are inline. Few actual modules are left. This is not to everyone's taste, so hack away.
-# GRUB MENU INCLUDED
+# GRUB MENUS INCLUDED
-Includes a grub boot menu where Linode expects to find it. You do NOT need grub, grub2, grub-legacy or any other. grub-legacy is a conflict because of menu.lst.
+* For Xen linodes (which are deprecated but still exist) we have `/boot/grub/menu.lst`. Configure your linode to boot with a pv-grub kernel, and it should just work. If not, please report a bug. You do NOT need to install the grub-legacy package (it will conflict).
+* For KVM (all new linodes), we have `/etc/grub.d/08_linux_linode`. The post-install hook will automatically regenerate a grub config with linux-linode as the first option. Configure your linode to boot with "GRUB2".
+* If your KVM linode has been migrated from an older Xen linode, you may also need to set the following options in `/etc/default/grub`:
+
+ GRUB_TERMINAL=serial
+ GRUB_DISABLE_OS_PROBER=true
+ GRUB_SERIAL_COMMAND="serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1"
+ GRUB_DISABLE_LINUX_UUID=true
+ GRUB_GFXPAYLOAD_LINUX=text
+
+ You may want to remove `quiet` from `GRUB_CMDLINE_LINUX_DEFAULT` as well.
+
+ After you've configured grub, you will need to regenerate the config file: `sudo grub-mkconfig -o /boot/grub/grub.cfg`
+
+ You may also need to install grub files to /boot: `grub-install --no-bootsector --boot-directory=/boot /dev/null`
# STEPS TO USE
- 1) pacman -Syu
- 2) pacman -U $pkgfile
- 3) reboot your Linode with a pv-grub kernel
- 4) report bugs ;)
+1. pacman -Syu
+1. pacman -U $pkgfile
+1. if you've recently migrated from xen to kvm, check your grub options (see above)
+1. reboot your linode into pv-grub (xen) or GRUB2 (kvm)
+1. report bugs ;)