a5bd9f6
From f46ac5e6c44d2fed8dcd8451196e6141d89cd90d Mon Sep 17 00:00:00 2001
a5bd9f6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
a5bd9f6
Date: Tue, 18 Sep 2012 13:04:06 +0200
a5bd9f6
Subject: [PATCH 042/364] 	* util/grub-mkconfig_lib.in (grub_tab): New
a5bd9f6
 variable. 	(grub_add_tab): New function. 	* util/grub.d/10_hurd.in:
a5bd9f6
 Replace \t with $grub_tab orgrub_add_tab. 	* util/grub.d/10_illumos.in:
a5bd9f6
 Likewise. 	* util/grub.d/10_kfreebsd.in: Likewise. 	*
a5bd9f6
 util/grub.d/10_linux.in: Likewise. 	* util/grub.d/10_netbsd.in: Likewise. 
a5bd9f6
 * util/grub.d/10_windows.in: Likewise. 	* util/grub.d/10_xnu.in:
a5bd9f6
 Likewise. 	* util/grub.d/20_linux_xen.in: Likewise. 	*
a5bd9f6
 util/grub.d/30_os-prober.in: Likewise.
a5bd9f6
a5bd9f6
---
a5bd9f6
 ChangeLog                   | 14 ++++++++++++++
a5bd9f6
 util/grub-mkconfig_lib.in   |  7 +++++++
a5bd9f6
 util/grub.d/10_hurd.in      |  8 ++++----
a5bd9f6
 util/grub.d/10_illumos.in   |  4 ++--
a5bd9f6
 util/grub.d/10_kfreebsd.in  |  8 ++++----
a5bd9f6
 util/grub.d/10_linux.in     |  8 ++++----
a5bd9f6
 util/grub.d/10_netbsd.in    | 10 +++++-----
a5bd9f6
 util/grub.d/10_windows.in   |  6 +++---
a5bd9f6
 util/grub.d/10_xnu.in       |  4 ++--
a5bd9f6
 util/grub.d/20_linux_xen.in |  6 +++---
a5bd9f6
 util/grub.d/30_os-prober.in | 20 ++++++++++----------
a5bd9f6
 11 files changed, 58 insertions(+), 37 deletions(-)
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index 3752a79..32849c6 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,5 +1,19 @@
a5bd9f6
 2012-09-18  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
 
a5bd9f6
+	* util/grub-mkconfig_lib.in (grub_tab): New variable.
a5bd9f6
+	(grub_add_tab): New function.
a5bd9f6
+	* util/grub.d/10_hurd.in: Replace \t with $grub_tab orgrub_add_tab.
a5bd9f6
+	* util/grub.d/10_illumos.in: Likewise.
a5bd9f6
+	* util/grub.d/10_kfreebsd.in: Likewise.
a5bd9f6
+	* util/grub.d/10_linux.in: Likewise.
a5bd9f6
+	* util/grub.d/10_netbsd.in: Likewise.
a5bd9f6
+	* util/grub.d/10_windows.in: Likewise.
a5bd9f6
+	* util/grub.d/10_xnu.in: Likewise.
a5bd9f6
+	* util/grub.d/20_linux_xen.in: Likewise.
a5bd9f6
+	* util/grub.d/30_os-prober.in: Likewise.
a5bd9f6
+
a5bd9f6
+2012-09-18  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
+
a5bd9f6
 	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
a5bd9f6
 	GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN on mac.
a5bd9f6
 	* grub-core/term/ieee1275/console.c (grub_console_init_lately): Use
a5bd9f6
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
a5bd9f6
index a9f5809..8f21eb2 100644
a5bd9f6
--- a/util/grub-mkconfig_lib.in
a5bd9f6
+++ b/util/grub-mkconfig_lib.in
a5bd9f6
@@ -347,3 +347,10 @@ grub_fmt () {
a5bd9f6
       cat
a5bd9f6
   fi
a5bd9f6
 }
a5bd9f6
+
a5bd9f6
+grub_tab="	"
a5bd9f6
+
a5bd9f6
+grub_add_tab () {
a5bd9f6
+  sed -e "s/^/$grub_tab/"
a5bd9f6
+}
a5bd9f6
+
a5bd9f6
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
a5bd9f6
index 45f0ad3..00efd68 100644
a5bd9f6
--- a/util/grub.d/10_hurd.in
a5bd9f6
+++ b/util/grub.d/10_hurd.in
a5bd9f6
@@ -108,7 +108,7 @@ menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnuhurd-s
a5bd9f6
 EOF
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
-  prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"|sed "s/^/$submenu_indentation/"
a5bd9f6
+  prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | grub_add_tab|sed "s/^/$submenu_indentation/"
a5bd9f6
   message="$(gettext_printf "Loading GNU Mach ...")"
a5bd9f6
 
a5bd9f6
   if [ x$type = xrecovery ] ; then
a5bd9f6
@@ -122,9 +122,9 @@ EOF
a5bd9f6
 EOF
a5bd9f6
 
a5bd9f6
   if [ x$type != xrecovery ] ; then
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/"| sed "s/^/$submenu_indentation/"
a5bd9f6
+      save_default_entry | grub_add_tab| sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
-  prepare_grub_to_access_device "${GRUB_DEVICE}" | sed -e "s/^/\t/"| sed "s/^/$submenu_indentation/"
a5bd9f6
+  prepare_grub_to_access_device "${GRUB_DEVICE}" | grub_add_tab| sed "s/^/$submenu_indentation/"
a5bd9f6
   message="$(gettext_printf "Loading the Hurd ...")"
a5bd9f6
   if [ x$type = xrecovery ] ; then
a5bd9f6
       opts=
a5bd9f6
@@ -158,7 +158,7 @@ do
a5bd9f6
 
a5bd9f6
   if [ "x$is_first_entry" = xtrue ]; then
a5bd9f6
       hurd_entry "$kernel" simple
a5bd9f6
-      submenu_indentation="\t"
a5bd9f6
+      submenu_indentation="$grub_tab"
a5bd9f6
     
a5bd9f6
       # TRANSLATORS: %s is replaced with an OS name
a5bd9f6
       echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnuhurd-advanced-$(grub_get_device_id "${GRUB_DEVICE_BOOT}")' {"
a5bd9f6
diff --git a/util/grub.d/10_illumos.in b/util/grub.d/10_illumos.in
a5bd9f6
index 2477466..0de616e 100644
a5bd9f6
--- a/util/grub.d/10_illumos.in
a5bd9f6
+++ b/util/grub.d/10_illumos.in
a5bd9f6
@@ -35,8 +35,8 @@ case "${GRUB_DISTRIBUTOR}" in
a5bd9f6
 esac
a5bd9f6
 
a5bd9f6
 echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'illumos-$(grub_get_device_id "${GRUB_DEVICE_BOOT}")' {"
a5bd9f6
-save_default_entry | sed -e "s/^/\t/"
a5bd9f6
-prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/"
a5bd9f6
+save_default_entry | grub_add_tab
a5bd9f6
+prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | grub_add_tab
a5bd9f6
 message="$(gettext_printf "Loading kernel of Illumos ...")"
a5bd9f6
   cat << EOF
a5bd9f6
 	insmod gzio
a5bd9f6
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
a5bd9f6
index b0e84e2..260dda8 100644
a5bd9f6
--- a/util/grub.d/10_kfreebsd.in
a5bd9f6
+++ b/util/grub.d/10_kfreebsd.in
a5bd9f6
@@ -54,7 +54,7 @@ load_kfreebsd_module ()
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   if [ -z "${prepare_module_dir_cache}" ]; then
a5bd9f6
-    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
a5bd9f6
+    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | grub_add_tab)"
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   printf '%s\n' "${prepare_module_dir_cache}"
a5bd9f6
@@ -91,10 +91,10 @@ kfreebsd_entry ()
a5bd9f6
       echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'kfreebsd-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
   if [ x$type != xrecovery ] ; then
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
a5bd9f6
+      save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
   if [ -z "${prepare_boot_cache}" ]; then
a5bd9f6
-    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
a5bd9f6
+    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
a5bd9f6
@@ -213,7 +213,7 @@ while [ "x$list" != "x" ] ; do
a5bd9f6
 
a5bd9f6
   if [ "x$is_first_entry" = xtrue ]; then
a5bd9f6
       kfreebsd_entry "${OS}" "${version}" simple
a5bd9f6
-      submenu_indentation="\t"
a5bd9f6
+      submenu_indentation="$grub_tab"
a5bd9f6
     
a5bd9f6
       if [ -z "$boot_device_id" ]; then
a5bd9f6
 	  boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
a5bd9f6
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
a5bd9f6
index 35f7a83..0724e16 100644
a5bd9f6
--- a/util/grub.d/10_linux.in
a5bd9f6
+++ b/util/grub.d/10_linux.in
a5bd9f6
@@ -101,7 +101,7 @@ linux_entry ()
a5bd9f6
       echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi      
a5bd9f6
   if [ x$type != xrecovery ] ; then
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/"
a5bd9f6
+      save_default_entry | grub_add_tab
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   # Use ELILO's generic "efifb" when it's known to be available.
a5bd9f6
@@ -123,12 +123,12 @@ linux_entry ()
a5bd9f6
 
a5bd9f6
   if [ x$dirname = x/ ]; then
a5bd9f6
     if [ -z "${prepare_root_cache}" ]; then
a5bd9f6
-      prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")"
a5bd9f6
+      prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
a5bd9f6
     fi
a5bd9f6
     printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
a5bd9f6
   else
a5bd9f6
     if [ -z "${prepare_boot_cache}" ]; then
a5bd9f6
-      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
a5bd9f6
+      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
a5bd9f6
     fi
a5bd9f6
     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
@@ -230,7 +230,7 @@ while [ "x$list" != "x" ] ; do
a5bd9f6
     linux_entry "${OS}" "${version}" simple \
a5bd9f6
     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
a5bd9f6
 
a5bd9f6
-    submenu_indentation="\t"
a5bd9f6
+    submenu_indentation="$grub_tab"
a5bd9f6
     
a5bd9f6
     if [ -z "$boot_device_id" ]; then
a5bd9f6
 	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
a5bd9f6
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
a5bd9f6
index 65275d7..b76332b 100644
a5bd9f6
--- a/util/grub.d/10_netbsd.in
a5bd9f6
+++ b/util/grub.d/10_netbsd.in
a5bd9f6
@@ -77,10 +77,10 @@ netbsd_load_fs_module ()
a5bd9f6
   prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^,	,'
a5bd9f6
   case "${loader}" in
a5bd9f6
     knetbsd)
a5bd9f6
-      printf "\tknetbsd_module_elf %s\n" "${kmodule_rel}"
a5bd9f6
+      printf "$grub_tabknetbsd_module_elf %s\n" "${kmodule_rel}"
a5bd9f6
       ;;
a5bd9f6
     multiboot)
a5bd9f6
-      printf "\tmodule %s\n" "${kmodule_rel}"
a5bd9f6
+      printf "$grub_tabmodule %s\n" "${kmodule_rel}"
a5bd9f6
       ;;
a5bd9f6
   esac
a5bd9f6
 }
a5bd9f6
@@ -121,11 +121,11 @@ netbsd_entry ()
a5bd9f6
   printf "%s\n" "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
a5bd9f6
   case "${loader}" in
a5bd9f6
     knetbsd)
a5bd9f6
-      printf "\tknetbsd %s -r %s %s\n" \
a5bd9f6
+      printf "$grub_tabknetbsd %s -r %s %s\n" \
a5bd9f6
         "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
a5bd9f6
       ;;
a5bd9f6
     multiboot)
a5bd9f6
-      printf "\tmultiboot %s %s root=%s %s\n" \
a5bd9f6
+      printf "$grub_tabmultiboot %s %s root=%s %s\n" \
a5bd9f6
         "${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
a5bd9f6
       ;;
a5bd9f6
   esac
a5bd9f6
@@ -159,7 +159,7 @@ for k in $(ls -t /netbsd*) ; do
a5bd9f6
 
a5bd9f6
   if [ "x$is_first_entry" = xtrue ]; then
a5bd9f6
       netbsd_entry "knetbsd"   "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
a5bd9f6
-    submenu_indentation="\t"
a5bd9f6
+    submenu_indentation="$grub_tab"
a5bd9f6
     
a5bd9f6
     if [ -z "$boot_device_id" ]; then
a5bd9f6
 	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
a5bd9f6
diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
a5bd9f6
index e5839cd..9025914 100644
a5bd9f6
--- a/util/grub.d/10_windows.in
a5bd9f6
+++ b/util/grub.d/10_windows.in
a5bd9f6
@@ -45,7 +45,7 @@ get_os_name_from_boot_ini ()
a5bd9f6
     sort | uniq | wc -l`" = 1 || return 1
a5bd9f6
 
a5bd9f6
   # Search 'default=PARTITION'
a5bd9f6
-  get_os_name_from_boot_ini_part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ \t\r]*$,,;1q'`
a5bd9f6
+  get_os_name_from_boot_ini_part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ $grub_tab\r]*$,,;1q'`
a5bd9f6
   test -n "$get_os_name_from_boot_ini_part" || return 1
a5bd9f6
 
a5bd9f6
   # Search 'PARTITION="NAME" ...'
a5bd9f6
@@ -87,8 +87,8 @@ for drv in $drives ; do
a5bd9f6
 menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
a5bd9f6
 EOF
a5bd9f6
 
a5bd9f6
-  save_default_entry | sed -e 's,^,\t,'
a5bd9f6
-  prepare_grub_to_access_device "$dev" | sed 's,^,\t,'
a5bd9f6
+  save_default_entry | sed -e 's,^,$grub_tab,'
a5bd9f6
+  prepare_grub_to_access_device "$dev" | sed 's,^,$grub_tab,'
a5bd9f6
   test -z "$needmap" || cat <
a5bd9f6
 	drivemap -s (hd0) \$root
a5bd9f6
 EOF
a5bd9f6
diff --git a/util/grub.d/10_xnu.in b/util/grub.d/10_xnu.in
a5bd9f6
index 55a9546..4270385 100644
a5bd9f6
--- a/util/grub.d/10_xnu.in
a5bd9f6
+++ b/util/grub.d/10_xnu.in
a5bd9f6
@@ -39,8 +39,8 @@ osx_entry() {
a5bd9f6
         cat << EOF
a5bd9f6
 menuentry '$(echo "Darwin/Mac OS X $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${GRUB_DEVICE}")'  {
a5bd9f6
 EOF
a5bd9f6
-	save_default_entry | sed -e "s/^/	/"
a5bd9f6
-	prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/	/"
a5bd9f6
+	save_default_entry | grub_add_tab
a5bd9f6
+	prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab
a5bd9f6
 	cat << EOF
a5bd9f6
         load_video
a5bd9f6
         set do_resume=0
a5bd9f6
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
a5bd9f6
index 33f1592..d4d0110 100644
a5bd9f6
--- a/util/grub.d/20_linux_xen.in
a5bd9f6
+++ b/util/grub.d/20_linux_xen.in
a5bd9f6
@@ -110,11 +110,11 @@ linux_entry ()
a5bd9f6
       echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
   if [ x$type != xrecovery ] ; then
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
a5bd9f6
+      save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   if [ -z "${prepare_boot_cache}" ]; then
a5bd9f6
-    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
a5bd9f6
+    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
a5bd9f6
   fi
a5bd9f6
   printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
a5bd9f6
   xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
a5bd9f6
@@ -236,7 +236,7 @@ while [ "x${xen_list}" != "x" ] ; do
a5bd9f6
 	    linux_entry "${OS}" "${version}" "${xen_version}" simple \
a5bd9f6
 		"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
a5bd9f6
 
a5bd9f6
-	    submenu_indentation="\t\t"
a5bd9f6
+	    submenu_indentation="$grub_tab$grub_tab"
a5bd9f6
     
a5bd9f6
 	    if [ -z "$boot_device_id" ]; then
a5bd9f6
 		boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
a5bd9f6
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
a5bd9f6
index bcc6c25..bf47dc3 100644
a5bd9f6
--- a/util/grub.d/30_os-prober.in
a5bd9f6
+++ b/util/grub.d/30_os-prober.in
a5bd9f6
@@ -54,8 +54,8 @@ osx_entry() {
a5bd9f6
         cat << EOF
a5bd9f6
 menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")'  {
a5bd9f6
 EOF
a5bd9f6
-	save_default_entry | sed -e "s/^/\t/"
a5bd9f6
-	prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
a5bd9f6
+	save_default_entry | grub_add_tab
a5bd9f6
+	prepare_grub_to_access_device ${DEVICE} | grub_add_tab
a5bd9f6
 	cat << EOF
a5bd9f6
         load_video
a5bd9f6
         set do_resume=0
a5bd9f6
@@ -126,8 +126,8 @@ for OS in ${OSPROBED} ; do
a5bd9f6
       cat << EOF
a5bd9f6
 menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
a5bd9f6
 EOF
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/"
a5bd9f6
-      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
a5bd9f6
+      save_default_entry | grub_add_tab
a5bd9f6
+      prepare_grub_to_access_device ${DEVICE} | grub_add_tab
a5bd9f6
 
a5bd9f6
       case ${LONGNAME} in
a5bd9f6
 	Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*)
a5bd9f6
@@ -181,14 +181,14 @@ EOF
a5bd9f6
 	used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'"
a5bd9f6
 
a5bd9f6
 	if [ -z "${prepare_boot_cache}" ]; then
a5bd9f6
-	  prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | sed -e "s/^/\t/")"
a5bd9f6
+	  prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)"
a5bd9f6
 	fi
a5bd9f6
 
a5bd9f6
 	if [ "x$is_first_entry" = xtrue ]; then
a5bd9f6
             cat << EOF
a5bd9f6
 menuentry '$(echo "$OS" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
a5bd9f6
 EOF
a5bd9f6
-	    save_default_entry | sed -e "s/^/\t/"
a5bd9f6
+	    save_default_entry | grub_add_tab
a5bd9f6
 	    printf '%s\n' "${prepare_boot_cache}"
a5bd9f6
 	    cat <<  EOF
a5bd9f6
 	linux ${LKERNEL} ${LPARAMS}
a5bd9f6
@@ -208,8 +208,8 @@ EOF
a5bd9f6
         cat << EOF
a5bd9f6
 	menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' {
a5bd9f6
 EOF
a5bd9f6
-	save_default_entry | sed -e "s/^/\t\t/"
a5bd9f6
-	printf '%s\n' "${prepare_boot_cache}" | sed -e "s/^/\t/"
a5bd9f6
+	save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
a5bd9f6
+	printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
a5bd9f6
 	cat <<  EOF
a5bd9f6
 		linux ${LKERNEL} ${LPARAMS}
a5bd9f6
 EOF
a5bd9f6
@@ -243,8 +243,8 @@ EOF
a5bd9f6
       cat << EOF
a5bd9f6
 menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
a5bd9f6
 EOF
a5bd9f6
-      save_default_entry | sed -e "s/^/\t/"
a5bd9f6
-      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
a5bd9f6
+      save_default_entry | grub_add_tab
a5bd9f6
+      prepare_grub_to_access_device ${DEVICE} | grub_add_tab
a5bd9f6
       grub_device="`${grub_probe} --device ${DEVICE} --target=drive`"
a5bd9f6
       mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
a5bd9f6
       grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6