summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-03-17 06:02:31 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-03-17 06:02:31 +0000
commit3e7d2c3bb270b56c4b30a5e580146c7a87cd9bf4 (patch)
tree0bfa332b636bf0a93b01c4ecfd1bc76e810f5419
parentd0b839870b22584041ba1f26968b7bab183194bb (diff)
downloadpackages-3e7d2c3bb270b56c4b30a5e580146c7a87cd9bf4.tar.gz
packages-3e7d2c3bb270b56c4b30a5e580146c7a87cd9bf4.tar.bz2
packages-3e7d2c3bb270b56c4b30a5e580146c7a87cd9bf4.tar.xz
packages-3e7d2c3bb270b56c4b30a5e580146c7a87cd9bf4.zip
user/grub: Enable UUID for root by default
Users that need the old behaviour can comment out the line in /e/d/g. This fixes a bug where installation from USB media causes sdX to change.
-rw-r--r--user/grub/APKBUILD4
-rw-r--r--user/grub/default-grub1
2 files changed, 3 insertions, 2 deletions
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 610e5e3c6..2c0cfdbc9 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grub
pkgver=2.04
-pkgrel=2
+pkgrel=3
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -182,6 +182,6 @@ sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d75378471274484
f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch
6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch
4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg
-1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub
+1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub
8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub
78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode"
diff --git a/user/grub/default-grub b/user/grub/default-grub
index 3fb754c7e..ca5656224 100644
--- a/user/grub/default-grub
+++ b/user/grub/default-grub
@@ -6,6 +6,7 @@ GRUB_DEFAULT="Adélie"
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="Adélie"
GRUB_CMDLINE_LINUX_DEFAULT="ro"
+GRUB_DISABLE_LINUX_PARTUUID=false
# Uncomment the following line if you do *not* want /boot/grub/grub.cfg to be
# automatically regenerated when easy-kernel is upgraded.