diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2022-02-28 22:37:21 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2022-02-28 22:37:21 +0000 |
| commit | 17160f21efe8e8ccaebe6f887624e4faab55f6c7 (patch) | |
| tree | 8fb105d0014a4e94e86322709abf9805f7ce7ecd /tools | |
| parent | 13cb004130d2b62f79fe421eaf4a7973efd6a505 (diff) | |
| download | src-17160f21efe8e8ccaebe6f887624e4faab55f6c7.tar.gz src-17160f21efe8e8ccaebe6f887624e4faab55f6c7.zip | |
install-boot.sh: Avoid - in function names for POSIX compatibility
FreeBSD sh supports this but other common POSIX shells do not; in
particular, dash does not, unlike bash and zsh. This allows the script
to be used on non-FreeBSD systems for release media building.
Reviewed by: emaste, brooks
Differential Revision: https://reviews.freebsd.org/D34000
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/boot/install-boot.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh index ce6e363a3067..d86441f23259 100755 --- a/tools/boot/install-boot.sh +++ b/tools/boot/install-boot.sh @@ -24,7 +24,7 @@ doit() { eval $* } -find-part() { +find_part() { dev=$1 part=$2 @@ -190,9 +190,9 @@ make_esp_mbr() { dev=$1 dst=$2 - s=$(find-part $dev "!239") + s=$(find_part $dev "!239") if [ -z "$s" ] ; then - s=$(find-part $dev "efi") + s=$(find_part $dev "efi") if [ -z "$s" ] ; then die "No ESP slice found" fi @@ -204,7 +204,7 @@ make_esp_gpt() { dev=$1 dst=$2 - idx=$(find-part $dev "efi") + idx=$(find_part $dev "efi") if [ -z "$idx" ] ; then die "No ESP partition found" fi @@ -215,7 +215,7 @@ boot_nogeli_gpt_ufs_legacy() { dev=$1 dst=$2 - idx=$(find-part $dev "freebsd-boot") + idx=$(find_part $dev "freebsd-boot") if [ -z "$idx" ] ; then die "No freebsd-boot partition found" fi @@ -235,7 +235,7 @@ boot_nogeli_gpt_zfs_legacy() { dev=$1 dst=$2 - idx=$(find-part $dev "freebsd-boot") + idx=$(find_part $dev "freebsd-boot") if [ -z "$idx" ] ; then die "No freebsd-boot partition found" fi @@ -256,7 +256,7 @@ boot_nogeli_mbr_ufs_legacy() { dst=$2 doit gpart bootcode -b ${mbr0} ${dev} - s=$(find-part $dev "freebsd") + s=$(find_part $dev "freebsd") if [ -z "$s" ] ; then die "No freebsd slice found" fi @@ -277,11 +277,11 @@ boot_nogeli_mbr_zfs_legacy() { dst=$2 # search to find the BSD slice - s=$(find-part $dev "freebsd") + s=$(find_part $dev "freebsd") if [ -z "$s" ] ; then die "No BSD slice found" fi - idx=$(find-part ${dev}s${s} "freebsd-zfs") + idx=$(find_part ${dev}s${s} "freebsd-zfs") if [ -z "$idx" ] ; then die "No freebsd-zfs slice found" fi |