[src/netbsd-6-0]: src/usr.sbin/postinstall Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/efe8a6ad0563
branches:  netbsd-6-0
changeset: 774941:efe8a6ad0563
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed May 21 20:29:11 2014 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1052):
        usr.sbin/postinstall/postinstall: revision 1.166
don't apply "ptyfsoldnodes" if /dev/pts does not exist, even if ptyfs
is listed in /etc/fstab.  without this, postinstall happily removes
all your ptys leaving you with none at all.  return an error if we
have ptyfs in /etc/fstab, but no /dev/pts.

diffstat:

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

diffs (23 lines):

diff -r 0217856e1e0c -r efe8a6ad0563 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Wed May 14 03:56:31 2014 +0000
+++ b/usr.sbin/postinstall/postinstall  Wed May 21 20:29:11 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.129.2.10 2012/09/30 18:59:53 bouyer Exp $
+# $NetBSD: postinstall,v 1.129.2.10.2.1 2014/05/21 20:29:11 bouyer Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1735,6 +1735,11 @@
                return 0
        fi
 
+       if [ ! -e "${DEST_DIR}/dev/pts" ]; then
+               msg "ptyfs is not properly configured: missing /dev/pts"
+               return 1
+       fi
+
        # Find the device major numbers for the pty master and slave
        # devices, by parsing the output from "MAKEDEV -s pty0".
        #