diff options
author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-22 20:56:32 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-22 20:56:32 -0300 |
commit | 76eeb17b731e98f885464c73b4f58509ba38987c (patch) | |
tree | f9a914058d274ad0b0273e230561aeadd3eed229 /libre | |
parent | 62e9c4ca38e5ab3b2eea5289d4f41eb75876fdb7 (diff) | |
download | abslibre-76eeb17b731e98f885464c73b4f58509ba38987c.tar.gz abslibre-76eeb17b731e98f885464c73b4f58509ba38987c.tar.bz2 abslibre-76eeb17b731e98f885464c73b4f58509ba38987c.zip |
grub2: deleting unnecessary files
Diffstat (limited to 'libre')
-rw-r--r-- | libre/grub2/archlinux_grub2_mkconfig_fixes.patch | 130 | ||||
-rw-r--r-- | libre/grub2/archlinux_grub_mkconfig_fixes.patch | 141 |
2 files changed, 0 insertions, 271 deletions
diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch deleted file mode 100644 index ef4b10ee6..000000000 --- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 859c2e8..c754dd7 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -242,6 +242,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index d9bcc15..a93dcb7 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -100,6 +100,14 @@ cat <<EOF - - EOF - -+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then -+ cat << EOF -+set menu_color_normal=$GRUB_COLOR_NORMAL -+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT -+ -+EOF -+fi -+ - serial=0; - 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 bc738f2..a6ab326 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os" - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" -+ OS="${GRUB_DISTRIBUTOR}" -+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}" - fi - - # loop-AES arranges things so that /dev/loop/X can be our root device, but -@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else -- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" - fi - - if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then -@@ -65,7 +65,9 @@ linux_entry () - version="$2" - recovery="$3" - args="$4" -- if ${recovery} ; then -+ if [ -n "$5" ] ; then -+ title="$(gettext_quoted "%s, with Linux %s") $5" -+ elif ${recovery} ; then - title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" - else - title="$(gettext_quoted "%s, with Linux %s")" -@@ -113,7 +115,9 @@ EOF - fi - printf '%s\n' "${prepare_boot_cache}" - fi -+ - message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ - cat << EOF - echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -132,11 +136,11 @@ EOF - - case x`uname -m` in - xi?86 | xx86_64) -- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - *) -- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - esac -@@ -151,16 +155,19 @@ while [ "x$list" != "x" ] ; do - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -- alt_version=`echo $version | sed -e "s,\.old$,,g"` -+ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` -+ alt_version="${base_init}-fallback" - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - initrd= -+ - 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" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "${basename/vmlinuz/initramfs}.img" "${basename/vmlinuz/kernel}.img"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -190,6 +197,16 @@ while [ "x$list" != "x" ] ; do - - linux_entry "${OS}" "${version}" false \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ for i in "initramfs-${version}-fallback.img" \ -+ "${basename/vmlinuz/initramfs}-fallback.img" "${basename/vmlinuz/kernel}-fallback.img"; do -+ if test -e "${dirname}/${i}"; then -+ initrd="$i" -+ linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback -+ break -+ fi -+ done -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" true \ - "single ${GRUB_CMDLINE_LINUX}" diff --git a/libre/grub2/archlinux_grub_mkconfig_fixes.patch b/libre/grub2/archlinux_grub_mkconfig_fixes.patch deleted file mode 100644 index 4b4cba92a..000000000 --- a/libre/grub2/archlinux_grub_mkconfig_fixes.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index df3b733..65a7fff 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat <<EOF - - EOF - -+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then -+ cat << EOF -+set menu_color_normal=$GRUB_COLOR_NORMAL -+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT -+ -+EOF -+fi -+ - serial=0; - 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 8c75fab..0d4a137 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -87,6 +87,8 @@ linux_entry () - case $type in - recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; - *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; - esac -@@ -100,7 +102,7 @@ linux_entry () - else - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" - fi - -@@ -132,7 +134,8 @@ linux_entry () - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - fi -- message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ -+ message="$(gettext_printf "Loading Linux %s ..." "${version}")" - sed "s/^/$submenu_indentation/" << EOF - echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -+ if test -e "/etc/arch-release" ; then -+ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then -+ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" -+ -+ if [ "x${version}" = "x" ] ; then -+ version="core repo kernel" -+ else -+ version="`echo "${version}" | sed -e 's,-,,g'`" -+ version="${version} kernel" -+ 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" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "${initrd_arch}.img" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if test -e "/etc/arch-release" ; then -+ is_first_entry="false" -+ -+ linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do -+ if test -e "${dirname}/${i}" ; then -+ initrd="${i}" -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ break -+ fi -+ done -+ fi -+ - if [ "x$is_first_entry" = xtrue ]; then - linux_entry "${OS}" "${version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -228,8 +263,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 - -+ if ! test -e "/etc/arch-release" ; then - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" -@@ -241,8 +279,10 @@ done - - # If at least one kernel was found, then we need to - # add a closing '}' for the submenu command. -+if ! test -e "/etc/arch-release" ; then - if [ x"$is_first_entry" != xtrue ]; then - echo '}' - fi -+fi - - echo "$title_correction_code" |