Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by tsutsui in ticket #622): 

distrib/miniroot/install.sub: revision 1.50
	distrib/miniroot/install.sub: revision 1.51

Fix miniroot installation failure on network configuration.  PR/54833

No particular comment in the PR.
Should be pulled up to netbsd-9.

Fix "[: SMALL test, no fallback usage" error on miniroot installation.

Avoid and replace use of '-a', '(' and ')' operatos marked obsolescent
by modern POSIX.1-2017:

 https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16

as suggested by kre@ in PR/54835.

Should be pulled up to netbsd-9.
This commit is contained in:
martin 2020-01-21 11:30:28 +00:00
parent 09dac0d30e
commit 180e77dfef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/miniroot/install.sub
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $NetBSD: install.sub,v 1.48.2.1 2019/11/17 07:04:35 martin Exp $
# $NetBSD: install.sub,v 1.48.2.2 2020/01/21 11:30:28 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@ -429,7 +429,7 @@ configure_ifs() {
# Get netmask
resp="" # force one iteration
while [ -n "${resp}" ]; do
while [ -z "${resp}" ]; do
echo -n "Netmask? [$_interface_mask] "
getresp "$_interface_mask"
_interface_mask=$resp
@ -1531,7 +1531,7 @@ unmount_fs()
_fstab=$1
fi
if [ ! \( -f $_fstab -a -s $_fstab \) ]; then
if ! [ -f "${_fstab}" ] || ! [ -s "${_fstab}" ]; then
echo "fstab empty" > /dev/tty
return
fi