Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/07 13:00:10+00:00 nexus.co.uk!pb
create /dev/pts before mounting it

BKrev: 418e1c69IOdm9TkU4RWD-D0pSZ5cPA

diff --git a/initscripts/initscripts-1.0/devpts.sh b/initscripts/initscripts-1.0/devpts.sh
index e69de29..334cf63 100644 (file)
--- a/initscripts/initscripts-1.0/devpts.sh
+++ b/initscripts/initscripts-1.0/devpts.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+. /etc/default/devpts
+
+test "`uname -s`" = "Linux" || exit 0
+
+#
+#      First find out if devpts is available. Also check if devfs
+#      is already mounted - in that case we don't want to use devpts.
+#
+if test ! -e /dev/.devfsd && ( grep -q devpts /proc/filesystems )
+then
+       #
+       #       Create multiplexor device.
+       #
+       test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2
+
+       #
+       #       Mount /dev/pts if needed.
+       #
+       if ( ! grep -q devpts /proc/mounts )
+       then
+               mkdir -p /dev/pts
+               mount -t devpts devpts /dev/pts -ogid=${TTYGRP},mode=${TTYMODE}
+       fi
+fi
+
+exit 0

diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 98ea832..6c5b2b4 100644 (file)
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "file://halt \
            file://ramdisk \