View | Details | Raw Unified | Return to bug 195835 | Differences between
and this patch

Collapse All | Expand All

(-)util/grub.d/10_kfreebsd.in (-7 / +6 lines)
Lines 54-63 load_kfreebsd_module () Link Here
54
  fi
54
  fi
55
55
56
  if [ -z "${prepare_module_dir_cache}" ]; then
56
  if [ -z "${prepare_module_dir_cache}" ]; then
57
    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
57
    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}"))"
58
  fi
58
  fi
59
59
60
  printf '%s\n' "${prepare_module_dir_cache}"
61
  cat << EOF
60
  cat << EOF
62
	kfreebsd_module_elf	${module_dir_rel}/${mod}.ko
61
	kfreebsd_module_elf	${module_dir_rel}/${mod}.ko
63
EOF
62
EOF
Lines 91-100 kfreebsd_entry () Link Here
91
      echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'kfreebsd-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
90
      echo "menuentry '$(echo "$OS" | grub_quote)' ${CLASS} \$menuentry_id_option 'kfreebsd-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
92
  fi
91
  fi
93
  if [ x$type != xrecovery ] ; then
92
  if [ x$type != xrecovery ] ; then
94
      save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/"
93
      save_default_entry | sed "s/^/$submenu_indentation/"
95
  fi
94
  fi
96
  if [ -z "${prepare_boot_cache}" ]; then
95
  if [ -z "${prepare_boot_cache}" ]; then
97
    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
96
    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT})"
98
  fi
97
  fi
99
98
100
  printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
99
  printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
Lines 122-131 EOF Link Here
122
    zfs)
121
    zfs)
123
      load_kfreebsd_module opensolaris false
122
      load_kfreebsd_module opensolaris false
124
123
125
      ls "${dirname}/zfs/zpool.cache" > /dev/null
124
      ls "${devices_dirname}/zfs/zpool.cache" > /dev/null
126
      printf '%s\n' "${prepare_boot_cache}"
125
      printf '%s\n' "${prepare_boot_cache}"
127
      sed "s/^/$submenu_indentation/" << EOF
126
      sed "s/^/$submenu_indentation/" << EOF
128
	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
127
	kfreebsd_module		${devices_rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
129
EOF
128
EOF
130
    ;;
129
    ;;
131
  esac
130
  esac
Lines 213-219 while [ "x$list" != "x" ] ; do Link Here
213
212
214
  if [ "x$is_first_entry" = xtrue ]; then
213
  if [ "x$is_first_entry" = xtrue ]; then
215
      kfreebsd_entry "${OS}" "${version}" simple
214
      kfreebsd_entry "${OS}" "${version}" simple
216
      submenu_indentation="\t"
215
      submenu_indentation=
217
    
216
    
218
      if [ -z "$boot_device_id" ]; then
217
      if [ -z "$boot_device_id" ]; then
219
	  boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
218
	  boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"

Return to bug 195835