Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/postinstall don't apply "ptyfsoldnodes" if /dev/pts...



details:   https://anonhg.NetBSD.org/src/rev/7e0265ff56e2
branches:  trunk
changeset: 328931:7e0265ff56e2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Apr 25 00:23:26 2014 +0000

description:
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 23bd357f7cdc -r 7e0265ff56e2 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Fri Apr 25 00:17:48 2014 +0000
+++ b/usr.sbin/postinstall/postinstall  Fri Apr 25 00:23:26 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.165 2014/03/08 16:36:24 martin Exp $
+# $NetBSD: postinstall,v 1.166 2014/04/25 00:23:26 mrg Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1790,6 +1790,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".
        #



Home | Main Index | Thread Index | Old Index