mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-03 12:35:02 +00:00
Code Issues Releases Activity

mkisoimages.sh: remove obsolete x$var convention

Browse Source 
Ancient shells had trouble with empty variables but this has not been
relevant for FreeBSD for a very long time (decades?).
This commit is contained in:
Ed Maste 2017-09-04 22:37:28 +00:00
parent 9cede44051
commit 93cf995aef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=323165
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/amd64/mkisoimages.sh
View File

@ -23,7 +23,7 @@
# extra-bits-dir, if provided, contains additional files to be merged # extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image. # into base-bits-dir as part of making the image.
if [ "x$1" = "x-b" ]; then if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below. # This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

2
release/i386/mkisoimages.sh
View File

@ -23,7 +23,7 @@
# extra-bits-dir, if provided, contains additional files to be merged # extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image. # into base-bits-dir as part of making the image.
if [ "x$1" = "x-b" ]; then if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below. # This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
shift shift

2
release/powerpc/mkisoimages.sh
View File

@ -23,7 +23,7 @@
# extra-bits-dir, if provided, contains additional files to be merged # extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image. # into base-bits-dir as part of making the image.
if [ "x$1" = "x-b" ]; then if [ "$1" = "-b" ]; then
# Apple boot code # Apple boot code
uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu" uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu"
bzip2 -d /tmp/hfs-boot-block.bz2 bzip2 -d /tmp/hfs-boot-block.bz2

2
release/sparc64/mkisoimages.sh
View File

@ -40,7 +40,7 @@ echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@" makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@"
rm -f "$BASEBITSDIR/etc/fstab" rm -f "$BASEBITSDIR/etc/fstab"
if [ "x$BOPT" != "x-b" ]; then if [ "$BOPT" != "-b" ]; then
mv "$NAME.tmp" "$NAME" mv "$NAME.tmp" "$NAME"
exit 0 exit 0
fi fi