Re: CVS commit: src/etc

[Martin Husemann <martin%duskware.de@localhost>]

Here is a patch that changes MAKEDEV to:

 - not include "{i,o,}pty" on any arch in the "all" target
 - mount a ptyfs on top of a tmpfs /dev if the latter is created and
   populated due to missing /dev/console by init

Since our ptyfs implementation currently only allows a single instance, this
can not lead to double mounted ptyfs even if /etc/fstab contains another
instance. However, it will (of course) fail if mount_ptyfs is not available
or support for the filesystem is missing (non modular kernel w/o proper
option).

What do you think?

Martin

Index: MAKEDEV.tmpl
===================================================================
RCS file: /cvsroot/src/etc/MAKEDEV.tmpl,v
retrieving revision 1.158
diff -u -r1.158 MAKEDEV.tmpl
--- MAKEDEV.tmpl        5 Sep 2012 08:25:53 -0000       1.158
+++ MAKEDEV.tmpl        14 Sep 2012 15:18:33 -0000
@@ -835,7 +835,7 @@
 
 init)
        # unless overridden by MD entry, this is equal to 'all'
-       makedev all opty
+       makedev all
        ;;
 
 %MI_DEVICES_BEGIN%
@@ -2274,6 +2274,12 @@
                fi
        fi
 
+       # try to mount ptyfs
+       if [ ! -d "$dev_mountpoint/pts" ]; then
+               mkdir "$dev_mountpoint/pts"
+       fi
+       mount_ptyfs ptyfs "$dev_mountpoint/pts"
+
        # Our current directory was in the lower file system; change it to
        # the newly mounted upper file system.
        cd "$dev_mountpoint"
Index: etc.amd64/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.amd64/MAKEDEV.conf,v
retrieving revision 1.18
diff -u -r1.18 MAKEDEV.conf
--- etc.amd64/MAKEDEV.conf      7 Apr 2012 17:22:10 -0000       1.18
+++ etc.amd64/MAKEDEV.conf      14 Sep 2012 15:18:33 -0000
@@ -16,7 +16,6 @@
        makedev ld0 ld1 ld2 ld3
        makedev xbd0 xbd1 xbd2 xbd3 xen
        makedev usbs
-       makedev ipty
        makedev local
        makedev cfs
        makedev lpa0 lpa1 lpa2
Index: etc.i386/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.i386/MAKEDEV.conf,v
retrieving revision 1.23
diff -u -r1.23 MAKEDEV.conf
--- etc.i386/MAKEDEV.conf       16 Aug 2012 13:31:25 -0000      1.23
+++ etc.i386/MAKEDEV.conf       14 Sep 2012 15:18:33 -0000
@@ -17,7 +17,6 @@
        makedev ld0 ld1 ld2 ld3
        makedev xbd0 xbd1 xbd2 xbd3 xen
        makedev usbs
-       makedev ipty
        makedev local
        makedev lpa0 lpa1 lpa2
        makedev lpt0 lpt1 lpt2
Index: etc.landisk/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.landisk/MAKEDEV.conf,v
retrieving revision 1.6
diff -u -r1.6 MAKEDEV.conf
--- etc.landisk/MAKEDEV.conf    16 Aug 2012 13:31:25 -0000      1.6
+++ etc.landisk/MAKEDEV.conf    14 Sep 2012 15:18:33 -0000
@@ -20,7 +20,6 @@
        makedev raid0
        makedev usbs
        makedev pci0
-       makedev ipty
        makedev sysmon
        ;;