Module Name: src
Committed By: kre
Date: Mon Dec 25 07:49:22 UTC 2023
Modified Files:
src/etc/rc.d: ip6addrctl
Log Message:
Don't use obsolete test(1) -a option/operator - use sh && instead.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/ip6addrctl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ip6addrctl
diff -u src/etc/rc.d/ip6addrctl:1.7 src/etc/rc.d/ip6addrctl:1.8
--- src/etc/rc.d/ip6addrctl:1.7 Tue Sep 8 12:52:18 2020
+++ src/etc/rc.d/ip6addrctl Mon Dec 25 07:49:22 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ip6addrctl,v 1.7 2020/09/08 12:52:18 martin Exp $
+# $NetBSD: ip6addrctl,v 1.8 2023/12/25 07:49:22 kre Exp $
# FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs
#
@@ -58,7 +58,7 @@ ip6addrctl_start()
# install the policy of the address selection algorithm.
case "${ip6addrctl_policy}" in
[Aa][Uu][Tt][Oo])
- if [ -r "${config_file}" -a -s "${config_file}" ]; then
+ if [ -r "${config_file}" ] && [ -s "${config_file}" ]; then
${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
${IP6ADDRCTL_CMD} install "${config_file}"
else
