mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 14:56:46 +02:00
0f3c992e98
Upgrade to Grub 2.12. Remove patches no longer required and rename/tweak existing patches still required. Add a minor fix to get Grub 2.12 to build (upstream forgot to include a necessary, but empty, file that build requires.
78 lines
3.1 KiB
Diff
78 lines
3.1 KiB
Diff
7a71eaf97380e505520b8ef92b35ffb44e6c5227 Alpine Linux fixes for menu
|
|
util/grub.d/10_linux.in | 12 ++++++++----
|
|
util/grub.d/20_linux_xen.in | 5 +++--
|
|
2 files changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 7afa1fd2f..76e006b99 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -21,17 +21,22 @@ prefix="@prefix@"
|
|
exec_prefix="@exec_prefix@"
|
|
datarootdir="@datarootdir@"
|
|
|
|
+if [ -f /etc/update-extlinux.conf ]; then
|
|
+ . /etc/update-extlinux.conf
|
|
+ GRUB_CMDLINE_LINUX_DEFAULT="modules=${modules} ${default_kernel_opts} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+fi
|
|
. "$pkgdatadir/grub-mkconfig_lib"
|
|
|
|
+
|
|
export TEXTDOMAIN=@PACKAGE@
|
|
export TEXTDOMAINDIR="@localedir@"
|
|
|
|
CLASS="--class gnu-linux --class gnu --class os"
|
|
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
- OS=GNU/Linux
|
|
+ OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
+ OS="${GRUB_DISTRIBUTOR}"
|
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
fi
|
|
|
|
@@ -54,8 +59,6 @@ GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true}
|
|
if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \
|
|
|| ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
|
|
- || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
|
- && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \
|
|
|| ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
|
|
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
|
|
@@ -229,6 +232,7 @@ while [ "x$list" != "x" ] ; do
|
|
"initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
|
|
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
+ "initramfs-${version}" \
|
|
"initramfs-genkernel-${version}" \
|
|
"initramfs-genkernel-${alt_version}" \
|
|
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
|
index 8656bb453..69c76a820 100644
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
|
|
CLASS="--class gnu-linux --class gnu --class os --class xen"
|
|
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
- OS=GNU/Linux
|
|
+ OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
+ OS="${GRUB_DISTRIBUTOR}"
|
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
fi
|
|
|
|
@@ -301,6 +301,7 @@ while [ "x${xen_list}" != "x" ] ; do
|
|
"initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
|
|
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
+ "initramfs-${version}" \
|
|
"initramfs-genkernel-${version}" \
|
|
"initramfs-genkernel-${alt_version}" \
|
|
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
--
|
|
2.39.2
|
|
|