diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/grub/05_archtheme | 6 | ||||
| -rw-r--r-- | libre/grub/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/grub/fix_stack_pointer_handling_16_relocator.patch | 13 | ||||
| -rw-r--r-- | libre/grub/grub-install.fix | 11 | ||||
| -rw-r--r-- | libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch | 15 | ||||
| -rw-r--r-- | libre/grub/grub.default | 2 | ||||
| -rw-r--r-- | libre/grub/grub2.install | 33 | ||||
| -rw-r--r-- | libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch | 134 | ||||
| -rw-r--r-- | libre/grub/grub2_bzr_export.sh | 113 | ||||
| -rw-r--r-- | libre/grub/grub_extras_lua_args_fix.patch | 13 | ||||
| -rw-r--r-- | libre/grub/parabola-mkconfig.patch | 32 | ||||
| -rw-r--r-- | libre/grub/parabola_grub_mkconfig_fixes.patch | 30 |
12 files changed, 21 insertions, 387 deletions
diff --git a/libre/grub/05_archtheme b/libre/grub/05_archtheme deleted file mode 100644 index 4d1b6fb20..000000000 --- a/libre/grub/05_archtheme +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -e - -cat << EOF -set menu_color_normal=light-blue/black -set menu_color_highlight=light-cyan/blue -EOF diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 8a1c01434..9b8102a4c 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,7 +9,7 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=1 +pkgrel=1.2 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -34,8 +34,8 @@ sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' '89290031b974780c6df76893836d2477d4add895' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - '31aa740fc225b3f3ed4917843038f9e8658a71be' - '79a0e597f19e15bd4c256384e0ef998bc6d06cc8' + '790b9bacb11281bdd43a94a6e9a87072feab42c1' + '06b926320cb2add6c157d59d46e553b89dd3aa03' 'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45' 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') diff --git a/libre/grub/fix_stack_pointer_handling_16_relocator.patch b/libre/grub/fix_stack_pointer_handling_16_relocator.patch deleted file mode 100644 index edc0ef502..000000000 --- a/libre/grub/fix_stack_pointer_handling_16_relocator.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S -index c3768f4..982415d 100644 ---- a/grub-core/lib/i386/relocator16.S -+++ b/grub-core/lib/i386/relocator16.S -@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss) - .byte 0xb8 - VARIABLE(grub_relocator16_sp) - .word 0 -- movw %ax, %ss -+ movzwl %ax, %esp - - /* movw imm32, %edx. */ - .byte 0x66, 0xba diff --git a/libre/grub/grub-install.fix b/libre/grub/grub-install.fix deleted file mode 100644 index 29e74bd44..000000000 --- a/libre/grub/grub-install.fix +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'grub-core/kern/emu/hostdisk.c' ---- grub-core/kern/emu/hostdisk.c 2012-04-18 21:48:52 +0000 -+++ grub-core/kern/emu/hostdisk.c 2012-04-19 18:35:06 +0000 -@@ -1081,7 +1081,7 @@ - { - int fd; - grub_disk_addr_t max = ~0ULL; -- fd = open_device (disk, sector, O_RDONLY, &max); -+ fd = open_device (disk, sector, O_WRONLY, &max); - if (fd < 0) - return grub_errno; diff --git a/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch deleted file mode 100644 index e1de26859..000000000 --- a/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 859c2e8..c4391dc 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -40,7 +40,9 @@ self=`basename $0` - grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" - grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" - --GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` -+if test -z "${GRUB_PREFIX}"; then -+ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` -+fi - - . "${datadir}/@PACKAGE@/grub-mkconfig_lib" - diff --git a/libre/grub/grub.default b/libre/grub/grub.default index 2ceb40543..8455b67dd 100644 --- a/libre/grub/grub.default +++ b/libre/grub/grub.default @@ -1,6 +1,6 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre" +GRUB_DISTRIBUTOR="Parabola" GRUB_CMDLINE_LINUX_DEFAULT="quiet" GRUB_CMDLINE_LINUX="" diff --git a/libre/grub/grub2.install b/libre/grub/grub2.install deleted file mode 100644 index 000533553..000000000 --- a/libre/grub/grub2.install +++ /dev/null @@ -1,33 +0,0 @@ -infodir=usr/share/info -filelist=(grub.info grub-dev.info) - -post_install() { - if [ -f /boot/grub/grub.cfg.pacsave ]; then - echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" - install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg - fi - - cat << 'EOM' -Generating grub.cfg.example config file... -This may fail on some machines running a custom kernel. -EOM - - grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null - echo "done." - - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch deleted file mode 100644 index 0e396b210..000000000 --- a/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav -new file mode 100644 -index 0000000..0eafd65 ---- /dev/null -+++ b/ChangeLog_Keshav -@@ -0,0 +1,12 @@ -+2012-01-04 Keshav P R <the.ridikulus.rat@gmail.com> -+ -+ Fixes for automake 1.11.2 -+ -+ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS. -+ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA. -+ * Makefile.am: Likewise. -+ * gentpl.py: Likewise. -+ * util/grub-mkstandalone.in: Likewise. -+ * util/grub-mknetdir.in: Likewise. -+ * util/grub-mkrescue.in: Likewise. -+ * util/grub-mkstandalone.in: Likewise. -diff --git a/Makefile.am b/Makefile.am -index c5f486e..395b0dd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h - # Install config.h into platformdir - platform_HEADERS = config.h - --pkglib_DATA += grub-mkconfig_lib --pkglib_DATA += update-grub_lib -+pkgdata_DATA += grub-mkconfig_lib -+pkgdata_DATA += update-grub_lib - - - if COND_i386_coreboot -diff --git a/conf/Makefile.common b/conf/Makefile.common -index 751188b..bbd59cc 100644 ---- a/conf/Makefile.common -+++ b/conf/Makefile.common -@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = - - man_MANS = - noinst_DATA = --pkglib_DATA = -+pkgdata_DATA = - bin_SCRIPTS = - sbin_SCRIPTS = - bin_PROGRAMS = -@@ -147,7 +147,7 @@ check_SCRIPTS = - grubconf_DATA = - check_PROGRAMS = - noinst_SCRIPTS = --pkglib_SCRIPTS = -+pkgdata_SCRIPTS = - noinst_PROGRAMS = - grubconf_SCRIPTS = - noinst_LIBRARIES = -diff --git a/gentpl.py b/gentpl.py -index 3008b80..a935f4d 100644 ---- a/gentpl.py -+++ b/gentpl.py -@@ -512,7 +512,7 @@ def script(platform): - r += "[+ ENDIF +]" - - r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ --$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ -+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ - chmod a+x [+ name +] - """) - -diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in -index e5a2172..7f6a36d 100644 ---- a/util/grub-mknetdir.in -+++ b/util/grub-mknetdir.in -@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ - host_os=@host_os@ - localedir=@datadir@/locale - datarootdir=@datarootdir@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -183,7 +183,7 @@ process_input_dir () - cp -f "$file" "$grubdir/" - fi - done -- for file in ${pkglib_DATA}; do -+ for file in ${pkgdata_DATA}; do - if test -f "${input_dir}/${file}"; then - cp -f "${input_dir}/${file}" "$grubdir/" - fi -diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in -index eff7708..f6b96d4 100644 ---- a/util/grub-mkrescue.in -+++ b/util/grub-mkrescue.in -@@ -27,7 +27,7 @@ libdir=@libdir@ - PACKAGE_NAME=@PACKAGE_NAME@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ - PACKAGE_VERSION=@PACKAGE_VERSION@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -163,7 +163,7 @@ process_input_dir () - cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/ - fi - done -- for file in ${pkglib_DATA}; do -+ for file in ${pkgdata_DATA}; do - if test -f "${input_dir}/${file}"; then - cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/ - fi -diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in -index b0dbf9b..92b7306 100644 ---- a/util/grub-mkstandalone.in -+++ b/util/grub-mkstandalone.in -@@ -27,7 +27,7 @@ libdir=@libdir@ - PACKAGE_NAME=@PACKAGE_NAME@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ - PACKAGE_VERSION=@PACKAGE_VERSION@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour - fi - done - --for file in ${pkglib_DATA}; do -+for file in ${pkgdata_DATA}; do - if test -f "${source_directory}/${file}"; then - cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/ - fi diff --git a/libre/grub/grub2_bzr_export.sh b/libre/grub/grub2_bzr_export.sh deleted file mode 100644 index f40588f82..000000000 --- a/libre/grub/grub2_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="1.99" - -_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/" -_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/" -_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB2_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB2_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME})" - bzr export --root="${_GRUB2_EXTRAS_NAME}" --format=tar "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB2_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="gpxe" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB2_BZR_REPO_DIR -unset _GRUB2_EXTRAS_REPOS_DIR -unset _GRUB2_EXTRAS_NAME diff --git a/libre/grub/grub_extras_lua_args_fix.patch b/libre/grub/grub_extras_lua_args_fix.patch deleted file mode 100644 index 5cb317ce3..000000000 --- a/libre/grub/grub_extras_lua_args_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c -index 9014320..055d620 100644 ---- a/grub-extras/lua/grub_lib.c -+++ b/grub-extras/lua/grub_lib.c -@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state) - if (! p) - return push_result (state); - -- grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0); -+ grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0); - } - else - { diff --git a/libre/grub/parabola-mkconfig.patch b/libre/grub/parabola-mkconfig.patch deleted file mode 100644 index 7c18a4cc2..000000000 --- a/libre/grub/parabola-mkconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in ---- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200 -+++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200 -@@ -134,7 +134,7 @@ - - case x`uname -m` in - xi?86 | xx86_64) -- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do -+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - *) -@@ -163,7 +163,8 @@ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ -- "${basename/vmlinuz/kernel}.img"; do -+ "${basename/vmlinuz/kernel}.img" \ -+ "${basename/vmlinuz/initramfs}.img"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -194,7 +195,8 @@ - linux_entry "${OS}" "${version}" false \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - for i in "initramfs-${version}-fallback.img" \ -- "${basename/vmlinuz/kernel}-fallback.img"; do -+ "${basename/vmlinuz/kernel}-fallback.img" \ -+ "${basename/vmlinuz/initramfs}-fallback.img"; do - if test -e "${dirname}/${i}"; then - initrd="$i" - linux_entry "${OS}" "${version}" true \ diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 19022aec6..e34770058 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -31,19 +31,23 @@ index 765bfdc..b148558 100644 gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 14402e8..64c9bb5 100644 +index 14402e8..daa353d 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in -@@ -31,7 +31,7 @@ +@@ -31,7 +31,11 @@ CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ OS="${GRUB_DISTRIBUTOR}" ++ if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" fi - -@@ -87,6 +87,8 @@ linux_entry () + +@@ -87,6 +91,8 @@ linux_entry () case $type in recovery) title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; @@ -52,7 +56,7 @@ index 14402e8..64c9bb5 100644 *) title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; esac -@@ -100,7 +102,7 @@ linux_entry () +@@ -100,7 +106,7 @@ linux_entry () else echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -61,7 +65,7 @@ index 14402e8..64c9bb5 100644 save_default_entry | sed -e "s/^/\t/" fi -@@ -132,7 +134,8 @@ linux_entry () +@@ -132,7 +138,8 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi @@ -71,7 +75,7 @@ index 14402e8..64c9bb5 100644 sed "s/^/$submenu_indentation/" << EOF echo '$message' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do +@@ -190,7 +197,22 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" @@ -87,14 +91,14 @@ index 14402e8..64c9bb5 100644 + fi + fi + fi -+ ++ initrd= + initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ -@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do +@@ -198,7 +220,8 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${version}" \ "initramfs-genkernel-${alt_version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ @@ -104,7 +108,7 @@ index 14402e8..64c9bb5 100644 if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do +@@ -226,6 +249,22 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi @@ -127,7 +131,7 @@ index 14402e8..64c9bb5 100644 if [ "x$is_first_entry" = xtrue ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do +@@ -239,8 +278,11 @@ while [ "x$list" != "x" ] ; do echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" fi @@ -139,7 +143,7 @@ index 14402e8..64c9bb5 100644 if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ "single ${GRUB_CMDLINE_LINUX}" -@@ -252,8 +290,10 @@ done +@@ -252,8 +294,10 @@ done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. |