[src/trunk]: src/usr.sbin/postinstall Stop continuing /var/shm check when var...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/999c74a11e52
branches:  trunk
changeset: 448365:999c74a11e52
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jan 31 10:06:32 2019 +0000

description:
Stop continuing /var/shm check when var_shm_symlink is in /etc/rc.conf.
OK'd by martin.

diffstat:

 usr.sbin/postinstall/postinstall |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r c5841d0c50fd -r 999c74a11e52 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Thu Jan 31 08:53:07 2019 +0000
+++ b/usr.sbin/postinstall/postinstall  Thu Jan 31 10:06:32 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.221 2018/12/04 16:53:44 plunky Exp $
+# $NetBSD: postinstall,v 1.222 2019/01/31 10:06:32 msaitoh Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2229,7 +2229,10 @@
        failed=0
 
        [ -f "${DEST_DIR}/etc/fstab" ] || return 0
-       if ${GREP} -w "/var/shm" "${DEST_DIR}/etc/fstab" >/dev/null 2>&1;
+       if ${GREP} -E "^var_shm_symlink" "${DEST_DIR}/etc/rc.conf" >/dev/null 2>&1;
+       then
+               failed=0;
+       elif ${GREP} -w "/var/shm" "${DEST_DIR}/etc/fstab" >/dev/null 2>&1;
        then
                failed=0;
        else