summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenton Liu2019-08-10 21:45:26 -0400
committerDenton Liu2019-08-10 22:02:15 -0400
commite4342d303c86ccde5e2ec42201614a668523513e (patch)
treea7ae9de97c76c1d8399dc733fbfd38b0d76427c9
parentb70600414ba138f7c5d9eed2d3e715ce6c7f621f (diff)
downloadaur-e4342d303c86ccde5e2ec42201614a668523513e.tar.gz
Fix patch
Previously, the patch had a syntax error with a use of `==` instead of `=`. Change the patch to remove this. While we're at it, change the style to more closely match the original source.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--grub-linux-default-hook.patch9
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 079281365e8c..9a9ba18c03ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grub-linux-default-hook
pkgdesc = Patch grub to make vmlinuz-linux the first entry
- pkgver = 1.0
+ pkgver = 1.1
pkgrel = 1
install = grub-linux-default-hook.install
arch = any
@@ -9,7 +9,7 @@ pkgbase = grub-linux-default-hook
source = grub-linux-default-hook.hook
source = grub-linux-default-hook.patch
sha256sums = bd7e0363d770c3898224a8d101f63979fa607042dc3621ecf98f638e0241858f
- sha256sums = 95a8c61846665b029d3d11cdb77b9208103fb55375e34032debac6cef2ecce39
+ sha256sums = 1410678372799031c75a96a0a62904746c0c15f101dee4ba29c641f3de2ada4c
pkgname = grub-linux-default-hook
diff --git a/PKGBUILD b/PKGBUILD
index 62cd071faf60..ccec3c5340c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Original patch by deusstultus: https://bugs.archlinux.org/task/28081#comment155230
pkgname=grub-linux-default-hook
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc="Patch grub to make vmlinuz-linux the first entry"
arch=('any')
@@ -12,7 +12,7 @@ install="$pkgname.install"
source=("$pkgname.hook"
"$pkgname.patch")
sha256sums=('bd7e0363d770c3898224a8d101f63979fa607042dc3621ecf98f638e0241858f'
- '95a8c61846665b029d3d11cdb77b9208103fb55375e34032debac6cef2ecce39')
+ '1410678372799031c75a96a0a62904746c0c15f101dee4ba29c641f3de2ada4c')
package() {
cd "$srcdir"
diff --git a/grub-linux-default-hook.patch b/grub-linux-default-hook.patch
index 7f4d1aa09614..ccf4363e24ee 100644
--- a/grub-linux-default-hook.patch
+++ b/grub-linux-default-hook.patch
@@ -1,6 +1,6 @@
--- /etc/grub.d/10_linux
+++ /etc/grub.d/10_linux
-@@ -184,8 +184,20 @@
+@@ -194,8 +194,19 @@
submenu_indentation=""
is_top_level=true
@@ -8,11 +8,10 @@
+default_kernel_name="/boot/vmlinuz-linux"
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
-+ if ! $default_kernel_grabbed; then
++ if [ "x$default_kernel_grabbed" = xfalse ] ; then
+ for i in $list; do
-+ if [ $i == $default_kernel_name ]
-+ then
-+ linux=$default_kernel_name
++ if [ "x$i" = "x$default_kernel_name" ] ; then
++ linux="$default_kernel_name"
+ break
+ fi
+ done