Attachment 153897 Details for Bug 195835 – new patch file

[patch] new patch file

patch-util_grub.d_10__kfreebsd.in (text/plain), 1.96 KB, created by bergerkos on 2015-03-06 13:33:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bergerkos

Created: 2015-03-06 13:33:01 UTC

Size: 1.96 KB

patch

obsolete

>--- util/grub.d/10_kfreebsd.in.orig	2012-03-04 21:02:30 UTC
>+++ util/grub.d/10_kfreebsd.in
>@@ -54,10 +54,9 @@ load_kfreebsd_module ()
>   fi
> 
>   if [ -z "${prepare_module_dir_cache}" ]; then
>-    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
>+    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}"))"
>   fi
> 
>-  printf '%s\n' "${prepare_module_dir_cache}"
>   cat << EOF
> 	kfreebsd_module_elf	${module_dir_rel}/${mod}.ko
> EOF
>@@ -91,10 +90,10 @@ kfreebsd_entry ()
>       echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'kfreebsd-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
>   fi
>   if [ x$type != xrecovery ] ; then
>-      save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
>+      save_default_entry | sed "s/^/$submenu_indentation/"
>   fi
>   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})"
>   fi
> 
>   printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
>@@ -122,10 +121,10 @@ EOF
>     zfs)
>       load_kfreebsd_module opensolaris false
> 
>-      ls "${dirname}/zfs/zpool.cache" > /dev/null
>+      ls "${devices_dirname}/zfs/zpool.cache" > /dev/null
>       printf '%s\n' "${prepare_boot_cache}"
>       sed "s/^/$submenu_indentation/" << EOF
>-	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
>+	kfreebsd_module		${devices_rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
> EOF
>     ;;
>   esac
>@@ -213,7 +212,7 @@ while [ "x$list" != "x" ] ; do
> 
>   if [ "x$is_first_entry" = xtrue ]; then
>       kfreebsd_entry "${OS}" "${version}" simple
>-      submenu_indentation="\t"
>+      submenu_indentation=
>     
>       if [ -z "$boot_device_id" ]; then
> 	  boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"

Actions: View | Diff

Attachments on bug 195835: 150413 | 153897 | 153914