Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/distrib/miniroot Pull up following revision(s) (requested...



details:   https://anonhg.NetBSD.org/src/rev/49678ea7e729
branches:  netbsd-9
changeset: 843764:49678ea7e729
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 21 11:30:28 2020 +0000

description:
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.

diffstat:

 distrib/miniroot/install.sub |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 9b470b596152 -r 49678ea7e729 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Tue Jan 21 11:21:52 2020 +0000
+++ b/distrib/miniroot/install.sub      Tue Jan 21 11:30:28 2020 +0000
@@ -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 @@
 
        # 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 @@
                _fstab=$1
        fi
 
-       if [ ! \( -f $_fstab -a -s $_fstab \) ]; then
+       if ! [ -f "${_fstab}" ] || ! [ -s "${_fstab}" ]; then
                echo "fstab empty" > /dev/tty
                return
        fi



Home | Main Index | Thread Index | Old Index