SHA256
1
0
forked from pool/grub2

Accepting request 50469 from devel:openSUSE:Factory

Copy from devel:openSUSE:Factory/grub2 based on submit request 50469 from user a_jaeger

OBS-URL: https://build.opensuse.org/request/show/50469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=7
This commit is contained in:
OBS User autobuild
2010-10-13 22:54:11 +00:00
committed by Git OBS Bridge
parent 00f565a5ae
commit ece0f2f3d9
7 changed files with 147 additions and 6 deletions

View File

@@ -2,6 +2,15 @@ Index: util/grub.d/10_linux.in
===================================================================
--- util/grub.d/10_linux.in.orig
+++ util/grub.d/10_linux.in
@@ -30,7 +30,7 @@ CLASS="--class gnu-linux --class gnu --c
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+ OS="${GRUB_DISTRIBUTOR}"
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
fi
@@ -84,7 +84,7 @@ EOF
printf '%s\n' "${prepare_boot_cache}"
cat << EOF
@@ -11,3 +20,26 @@ Index: util/grub.d/10_linux.in
EOF
if test -n "${initrd}" ; then
cat << EOF
@@ -97,9 +97,20 @@ EOF
EOF
}
+# do not output vmlinux if vmlinuz of same version exists
list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done`
+ if grub_file_is_not_garbage "$i" ; then
+ case $i in
+ */vmlinux*)
+ j=${i/vmlinux/vmlinuz}
+ k=${j/.gz/}
+ if test ! -e $k ; then echo -n "$i "; fi
+ ;;
+ *)
+ echo -n "$i "
+ ;;
+ esac
+ done`
prepare_boot_cache=
while [ "x$list" != "x" ] ; do