Module Name: src
Committed By: bouyer
Date: Wed May 21 20:29:02 UTC 2014
Modified Files:
src/usr.sbin/postinstall [netbsd-6]: postinstall
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.129.2.10 -r1.129.2.11 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.129.2.10 src/usr.sbin/postinstall/postinstall:1.129.2.11
--- src/usr.sbin/postinstall/postinstall:1.129.2.10 Sun Sep 30 18:59:53 2012
+++ src/usr.sbin/postinstall/postinstall Wed May 21 20:29:02 2014
@@ -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.11 2014/05/21 20:29:02 bouyer Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1735,6 +1735,11 @@ do_ptyfsoldnodes()
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".
#
