Module Name: src Committed By: kre Date: Sun Sep 16 21:32:29 UTC 2018
Modified Files: src/distrib/miniroot: install.sh upgrade.sh Log Message: Remove uses of test ... -a ... and test ... -o ... To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/miniroot/install.sh cvs rdiff -u -r1.22 -r1.23 src/distrib/miniroot/upgrade.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/miniroot/install.sh diff -u src/distrib/miniroot/install.sh:1.25 src/distrib/miniroot/install.sh:1.26 --- src/distrib/miniroot/install.sh:1.25 Sun Sep 20 22:44:06 2009 +++ src/distrib/miniroot/install.sh Sun Sep 16 21:32:29 2018 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.25 2009/09/20 22:44:06 abs Exp $ +# $NetBSD: install.sh,v 1.26 2018/09/16 21:32:29 kre Exp $ # # Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -377,7 +377,7 @@ mount_fs /tmp/fstab.shadow mount | while read line; do set -- $line - if [ "$2" = "/" -a "$3" = "nfs" ]; then + if [ "$2" = "/" ] && [ "$3" = "nfs" ]; then echo "You appear to be running diskless." echo -n "Are the install sets on one of your currently mounted filesystems? [n] " getresp "n" Index: src/distrib/miniroot/upgrade.sh diff -u src/distrib/miniroot/upgrade.sh:1.22 src/distrib/miniroot/upgrade.sh:1.23 --- src/distrib/miniroot/upgrade.sh:1.22 Wed Apr 30 13:10:48 2008 +++ src/distrib/miniroot/upgrade.sh Sun Sep 16 21:32:29 2018 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.22 2008/04/30 13:10:48 martin Exp $ +# $NetBSD: upgrade.sh,v 1.23 2018/09/16 21:32:29 kre Exp $ # # Copyright (c) 1996-2000,2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -238,8 +238,8 @@ esac ( > /tmp/fstab while read _dev _mp _fstype _rest ; do - if [ "X${_fstype}" = X"ufs" -o \ - "X${_fstype}" = X"ffs" ]; then + if [ "X${_fstype}" = X"ufs" ] || + [ "X${_fstype}" = X"ffs" ]; then if [ "X${_fstype}" = X"ufs" ]; then # Convert ufs to ffs. _fstype=ffs