Page MenuHomeFreeBSD
Differential D19992 Diff 56443 tools/boot/install-boot.sh

Changeset View

Standalone View

View Options

tools/boot/install-boot.sh

Show First 20 Lines • Show All 128 Lines • ▼ Show 20 Lines rmdir "${mntpt}"
# Keep a copy of the existing loader.efi in case there's a problem with the new one # Keep a copy of the existing loader.efi in case there's a problem with the new one
if [ -f "${mntpt}/EFI/freebsd/loader.efi" ] && [ "$kbfree" -gt "$((loadersize * 2))" ]; then if [ -f "${mntpt}/EFI/freebsd/loader.efi" ] && [ "$kbfree" -gt "$((loadersize * 2))" ]; then
cp "${mntpt}/EFI/freebsd/loader.efi" "${mntpt}/EFI/freebsd/loader-old.efi" cp "${mntpt}/EFI/freebsd/loader.efi" "${mntpt}/EFI/freebsd/loader-old.efi"
fi fi
echo "Copying loader to /EFI/freebsd on ESP" echo "Copying loader to /EFI/freebsd on ESP"
cp "${file}" "${mntpt}/EFI/freebsd/loader.efi" cp "${file}" "${mntpt}/EFI/freebsd/loader.efi"
if [ -n "${updatesystem}" ]; then
existingbootentryloaderfile=$(efibootmgr -v | grep "${mntpt}//EFI/freebsd/loader.efi") existingbootentryloaderfile=$(efibootmgr -v | grep "${mntpt}//EFI/freebsd/loader.efi")
if [ -z "$existingbootentryloaderfile" ]; then if [ -z "$existingbootentryloaderfile" ]; then
# Try again without the double forward-slash in the path # Try again without the double forward-slash in the path
existingbootentryloaderfile=$(efibootmgr -v | grep "${mntpt}/EFI/freebsd/loader.efi") existingbootentryloaderfile=$(efibootmgr -v | grep "${mntpt}/EFI/freebsd/loader.efi")
fi fi
if [ -z "$existingbootentryloaderfile" ]; then if [ -z "$existingbootentryloaderfile" ]; then
echo "Creating UEFI boot entry for FreeBSD" echo "Creating UEFI boot entry for FreeBSD"
efibootmgr --create --label FreeBSD --loader "${mntpt}/EFI/freebsd/loader.efi" > /dev/null efibootmgr --create --label FreeBSD --loader "${mntpt}/EFI/freebsd/loader.efi" > /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
die "Failed to create new boot entry" die "Failed to create new boot entry"
fi fi
# When creating new entries, efibootmgr doesn't mark them active, so we need to # When creating new entries, efibootmgr doesn't mark them active, so we need to
# do so. It doesn't make it easy to find which entry it just added, so rely on # do so. It doesn't make it easy to find which entry it just added, so rely on
# the fact that it places the new entry first in BootOrder. # the fact that it places the new entry first in BootOrder.
bootorder=$(efivar --name 8be4df61-93ca-11d2-aa0d-00e098032b8c-BootOrder --print --no-name --hex | head -1) bootorder=$(efivar --name 8be4df61-93ca-11d2-aa0d-00e098032b8c-BootOrder --print --no-name --hex | head -1)
bootentry=$(echo "${bootorder}" | cut -w -f 3)$(echo "${bootorder}" | cut -w -f 2) bootentry=$(echo "${bootorder}" | cut -w -f 3)$(echo "${bootorder}" | cut -w -f 2)
echo "Marking UEFI boot entry ${bootentry} active" echo "Marking UEFI boot entry ${bootentry} active"
efibootmgr --activate "${bootentry}" > /dev/null efibootmgr --activate "${bootentry}" > /dev/null
else else
echo "Existing UEFI FreeBSD boot entry found: not creating a new one" echo "Existing UEFI FreeBSD boot entry found: not creating a new one"
fi fi
fi
umount "${mntpt}" umount "${mntpt}"
rmdir "${mntpt}" rmdir "${mntpt}"
echo "Finished updating ESP" echo "Finished updating ESP"
} }
make_esp() { make_esp() {
local file loaderfile local file loaderfile
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Linesusage() {
printf 'Usage: %s -b bios [-d destdir] -f fs [-g geli] [-h] [-o optargs] -s scheme <bootdev>\n' "$0" printf 'Usage: %s -b bios [-d destdir] -f fs [-g geli] [-h] [-o optargs] -s scheme <bootdev>\n' "$0"
printf 'Options:\n' printf 'Options:\n'
printf ' bootdev device to install the boot code on\n' printf ' bootdev device to install the boot code on\n'
printf ' -b bios bios type: legacy, uefi or both\n' printf ' -b bios bios type: legacy, uefi or both\n'
printf ' -d destdir destination filesystem root\n' printf ' -d destdir destination filesystem root\n'
printf ' -f fs filesystem type: ufs or zfs\n' printf ' -f fs filesystem type: ufs or zfs\n'
printf ' -g geli yes or no\n' printf ' -g geli yes or no\n'
printf ' -h this help/usage text\n' printf ' -h this help/usage text\n'
printf ' -u Run commands such as efibootmgr to update the\n'
tsoomeUnsubmitted
Done
Inline Actions

IMO the -n is a bit bad (confusing) choice there; -n often means "do not write" or perform dry run.

maybe better once would be -i for operate on image file.

tsoome: IMO the -n is a bit bad (confusing) choice there; -n often means "do not write" or perform dry…
impUnsubmitted
Not Done
Inline Actions

I tend to agree, but not sure -i is the right arg.
Maybe it would be better to have this be -e or -m to force running of efibootmgr instead?
On the other hand, if we take a step back, we are trying to distinguish two cases here: updating a system in place and installing into an image that will be transported elsewhere. 'offline' is really a poor substitute for this system vs elsewhere, so maybe some other word would be helpful here to describe it, and that may suggest the arg to use.

imp: I tend to agree, but not sure -i is the right arg. Maybe it would be better to have this be -e…
bcranAuthorUnsubmitted
Done
Inline Actions

I agree with -n being a bit confusing, but -i is also often 'interactive'. I might choose -m as a semi-random option that could also be 'memory disk'.
I'd prefer to leave the existing behavior as is, and _not_ require people to add a new option to operate in-place.

bcran: I agree with `-n` being a bit confusing, but `-i` is also often 'interactive'. I might choose `…
bcranAuthorUnsubmitted
Done
Inline Actions

I've changed it to -u to cause it to update the current system (i.e. run efibootmgr).

bcran: I've changed it to `-u` to cause it to update the current system (i.e. run efibootmgr).
printf ' currently running system\n'
printf ' -o optargs optional arguments\n' printf ' -o optargs optional arguments\n'
printf ' -s scheme mbr or gpt\n' printf ' -s scheme mbr or gpt\n'
exit 0 exit 0
} }
srcroot=/ srcroot=/
# Note: we really don't support geli boot in this script yet. # Note: we really don't support geli boot in this script yet.
geli=nogeli geli=nogeli
while getopts "b:d:f:g:ho:s:" opt; do while getopts "b:d:f:g:ho:s:u" opt; do
case "$opt" in case "$opt" in
b) b)
bios=${OPTARG} bios=${OPTARG}
;; ;;
d) d)
srcroot=${OPTARG} srcroot=${OPTARG}
;; ;;
f) f)
fs=${OPTARG} fs=${OPTARG}
;; ;;
g) g)
case ${OPTARG} in case ${OPTARG} in
[Yy][Ee][Ss]|geli) geli=geli ;; [Yy][Ee][Ss]|geli) geli=geli ;;
*) geli=nogeli ;; *) geli=nogeli ;;
esac esac
;;
u)
updatesystem=1
;; ;;
o) o)
opts=${OPTARG} opts=${OPTARG}
;; ;;
s) s)
scheme=${OPTARG} scheme=${OPTARG}
;; ;;
Show All 31 Lines