mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-20 03:47:16 +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.
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
8d370d5bd81c8467878cf88be24938a33efc06bf Fix grub-mkconfig detection of linux-edge-virt
|
|
util/grub.d/10_linux.in | 2 +-
|
|
util/grub.d/20_linux_xen.in | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index a694050df..4e5f71f0b 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -210,7 +210,7 @@ while [ "x$list" != "x" ] ; do
|
|
basename=`basename $linux`
|
|
dirname=`dirname $linux`
|
|
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
+ version=`echo $basename | sed -e "s,^[^-]*-,,g"`
|
|
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
|
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
|
index b6ea5bbd1..15319fe06 100644
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -184,7 +184,7 @@ linux_list=
|
|
for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
|
if grub_file_is_not_garbage "$i"; then
|
|
basename=$(basename $i)
|
|
- version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
|
+ version=$(echo $basename | sed -e "s,^[^-]*-,,g")
|
|
dirname=$(dirname $i)
|
|
config=
|
|
for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
@@ -290,7 +290,7 @@ while [ "x${xen_list}" != "x" ] ; do
|
|
basename=`basename $linux`
|
|
dirname=`dirname $linux`
|
|
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
+ version=`echo $basename | sed -e "s,^[^-]*-,,g"`
|
|
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
|
|
--
|
|
2.39.2
|
|
|