mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-14 12:31:18 +02:00
110 lines
5.4 KiB
Plaintext
110 lines
5.4 KiB
Plaintext
--- ./util/grub.d/10_linux.in.orig 2012-04-19 00:24:38.000000000 +0300
|
|
+++ ./util/grub.d/10_linux.in 2015-10-14 20:44:27.262522000 +0200
|
|
@@ -39,7 +39,7 @@
|
|
# the initrds that Linux uses don't like that.
|
|
case ${GRUB_DEVICE} in
|
|
/dev/loop/*|/dev/loop[0-9])
|
|
- GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
+ GRUB_DEVICE=`losetup ${GRUB_DEVICE} | gsed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
;;
|
|
esac
|
|
|
|
@@ -66,7 +66,7 @@
|
|
fi;;
|
|
xzfs)
|
|
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
- bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
+ bootfs="`make_system_path_relative_to_its_root / | gsed -e "s,@$,,"`"
|
|
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
;;
|
|
esac
|
|
@@ -91,61 +91,61 @@
|
|
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
|
|
esac
|
|
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
- replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
+ replacement_title="$(echo "Advanced options for ${OS}" | gsed 's,>,>>,g')>$(echo "$title" | gsed 's,>,>>,g')"
|
|
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
fi
|
|
- echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
+ echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | gsed "s/^/$submenu_indentation/"
|
|
else
|
|
- echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
+ echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | gsed "s/^/$submenu_indentation/"
|
|
fi
|
|
if [ x$type != xrecovery ] ; then
|
|
- save_default_entry | sed -e "s/^/\t/"
|
|
+ save_default_entry | gsed -e "s/^/\t/"
|
|
fi
|
|
|
|
# Use ELILO's generic "efifb" when it's known to be available.
|
|
# FIXME: We need an interface to select vesafb in case efifb can't be used.
|
|
if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
|
|
- echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
+ echo " load_video" | gsed "s/^/$submenu_indentation/"
|
|
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
|
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
|
- echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
|
+ echo " set gfxpayload=keep" | gsed "s/^/$submenu_indentation/"
|
|
fi
|
|
else
|
|
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
|
- echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
+ echo " load_video" | gsed "s/^/$submenu_indentation/"
|
|
fi
|
|
- echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
|
|
+ echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | gsed "s/^/$submenu_indentation/"
|
|
fi
|
|
|
|
- echo " insmod gzio" | sed "s/^/$submenu_indentation/"
|
|
+ echo " insmod gzio" | gsed "s/^/$submenu_indentation/"
|
|
|
|
if [ x$dirname = x/ ]; then
|
|
if [ -z "${prepare_root_cache}" ]; then
|
|
- prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")"
|
|
+ prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | gsed -e "s/^/\t/")"
|
|
fi
|
|
- printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
|
|
+ printf '%s\n' "${prepare_root_cache}" | gsed "s/^/$submenu_indentation/"
|
|
else
|
|
if [ -z "${prepare_boot_cache}" ]; then
|
|
- prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
|
|
+ prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | gsed -e "s/^/\t/")"
|
|
fi
|
|
- printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
+ printf '%s\n' "${prepare_boot_cache}" | gsed "s/^/$submenu_indentation/"
|
|
fi
|
|
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
- sed "s/^/$submenu_indentation/" << EOF
|
|
+ gsed "s/^/$submenu_indentation/" << EOF
|
|
echo '$message'
|
|
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
EOF
|
|
if test -n "${initrd}" ; then
|
|
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
- sed "s/^/$submenu_indentation/" << EOF
|
|
+ gsed "s/^/$submenu_indentation/" << EOF
|
|
echo '$message'
|
|
initrd ${rel_dirname}/${initrd}
|
|
EOF
|
|
fi
|
|
- sed "s/^/$submenu_indentation/" << EOF
|
|
+ gsed "s/^/$submenu_indentation/" << EOF
|
|
}
|
|
EOF
|
|
}
|
|
@@ -186,8 +186,8 @@
|
|
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"`
|
|
- alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
+ version=`echo $basename | gsed -e "s,^[^0-9]*-,,g"`
|
|
+ alt_version=`echo $version | gsed -e "s,\.old$,,g"`
|
|
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
|
|
initrd=
|