Integrate the ISDN subsystem into the /etc/rc framework

Reviewed by: Joerg Wunsch

11 files changed, 140 insertions, 10 deletions

diff --git a/etc/Makefile b/etc/Makefile
index c5b526b..aa155b3 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.185 1999/01/10 14:30:41 hm Exp $
+#	$Id: Makefile,v 1.186 1999/01/10 21:08:26 rnordier Exp $
 
 SUBDIR=	sendmail
 
@@ -8,7 +8,7 @@ BIN1=   aliases amd.map crontab csh.cshrc csh.login csh.logout dm.conf \
 	inetd.conf auth.conf login.conf login.access motd modems networks \
 	newsyslog.conf pam.conf phones pccard.conf.sample \
 	printcap profile protocols \
-	rc rc.atm rc.conf rc.devfs rc.firewall rc.network rc.pccard \
+	rc rc.atm rc.conf rc.devfs rc.firewall rc.isdn rc.network rc.pccard \
 	rc.serial rc.shutdown etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \
 	remote security services shells syslog.conf \
 	etc.${MACHINE_ARCH}/ttys etc.${MACHINE_ARCH}/disktab rpc make.conf \
diff --git a/etc/network.subr b/etc/network.subr
index ab1c3ac..e3c7c8d 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.conf b/etc/rc.conf
index be12e1d..5483d86 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.72 1999/01/09 01:17:41 jkh Exp $
+#	$Id: rc.conf,v 1.73 1999/01/10 22:06:22 n_hibma Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -130,6 +130,13 @@ atm_enable="NO"			# Configure ATM interfaces (or NO).
 atm_pvcs=""			# Set to PVC list (or leave empty).
 atm_arps=""			# Set to permanent ARP list (or leave empty).
 
+### ISDN interface options: ###
+isdn_enable="NO"		# Enable the ISDN subsystem (or NO).
+isdn_fsdev="/dev/ttyv4"		# Output device for fullscreen mode (or NO for daemon mode).
+isdn_flags="-dn -d0x1f9"	# Flags for isdnd
+isdn_trace="NO"			# Enable the ISDN trace subsystem (or NO).
+isdn_traceflags="-f /var/tmp/isdntrace0"	# Flags for isdntrace
+
 ### Miscellaneous network options: ###
 icmp_bmcastecho="NO"	# respond to broadcast ping packets
 
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
new file mode 100644
index 0000000..ec159cc
--- /dev/null
+++ b/etc/rc.d/isdnd
@@ -0,0 +1,44 @@
+#!/bin/sh
+#---------------------------------------------------------------------------
+#
+#	/etc/rc.isdn - isdn4bsd startup script
+#	--------------------------------------
+#
+#	last edit-date: [Tue Jan 12 15:35:36 1999]
+#
+#	$Id:$
+#
+#---------------------------------------------------------------------------
+
+if [ "X${isdn_enable}" = X"YES" ] ; then
+
+	# terminal type for fullscreen mode, default to syscons driver
+	isdn_ttype=cons25
+
+	# check for pcvt driver (VT100/VT220 emulator)
+	if [ -x /usr/sbin/ispcvt ] ; then
+		if /usr/sbin/ispcvt ; then
+			isdn_ttype=pcvt25
+		fi
+	fi
+	
+	if [ "X${isdn_flags}" = X"NO" ] ; then
+		isdn_flags=""
+	fi
+	
+	# start the isdn daemon
+	if [ -x /usr/sbin/isdnd ] ; then
+		echo -n ' isdnd'
+		if [ "X${isdn_fsdev}" = X"NO" ] ; then
+			/usr/sbin/isdnd ${isdn_flags} 
+		else
+			/usr/sbin/isdnd ${isdn_flags} -f -r ${isdn_fsdev} -t ${isdn_ttype}
+		fi
+	fi
+
+	# start isdntrace	
+	if [ "X${isdn_trace}" = X"YES" -a -x /usr/sbin/isdntrace ] ; then
+		echo -n ' isdntrace'
+		nohup /usr/sbin/isdntrace ${isdn_traceflags} >/dev/null 2>&1 &
+	fi
+fi
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then
diff --git a/etc/rc.isdn b/etc/rc.isdn
new file mode 100644
index 0000000..ec159cc
--- /dev/null
+++ b/etc/rc.isdn
@@ -0,0 +1,44 @@
+#!/bin/sh
+#---------------------------------------------------------------------------
+#
+#	/etc/rc.isdn - isdn4bsd startup script
+#	--------------------------------------
+#
+#	last edit-date: [Tue Jan 12 15:35:36 1999]
+#
+#	$Id:$
+#
+#---------------------------------------------------------------------------
+
+if [ "X${isdn_enable}" = X"YES" ] ; then
+
+	# terminal type for fullscreen mode, default to syscons driver
+	isdn_ttype=cons25
+
+	# check for pcvt driver (VT100/VT220 emulator)
+	if [ -x /usr/sbin/ispcvt ] ; then
+		if /usr/sbin/ispcvt ; then
+			isdn_ttype=pcvt25
+		fi
+	fi
+	
+	if [ "X${isdn_flags}" = X"NO" ] ; then
+		isdn_flags=""
+	fi
+	
+	# start the isdn daemon
+	if [ -x /usr/sbin/isdnd ] ; then
+		echo -n ' isdnd'
+		if [ "X${isdn_fsdev}" = X"NO" ] ; then
+			/usr/sbin/isdnd ${isdn_flags} 
+		else
+			/usr/sbin/isdnd ${isdn_flags} -f -r ${isdn_fsdev} -t ${isdn_ttype}
+		fi
+	fi
+
+	# start isdntrace	
+	if [ "X${isdn_trace}" = X"YES" -a -x /usr/sbin/isdntrace ] ; then
+		echo -n ' isdntrace'
+		nohup /usr/sbin/isdntrace ${isdn_traceflags} >/dev/null 2>&1 &
+	fi
+fi
diff --git a/etc/rc.network b/etc/rc.network
index ab1c3ac..e3c7c8d 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
+#	$Id: rc.network,v 1.37 1999/01/03 22:19:23 jkh Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -31,6 +31,11 @@ network_pass1() {
 	    atm_pass1
     fi
 
+    # ISDN subsystem startup
+    if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then
+	    . /etc/rc.isdn
+    fi
+
     # Set up all the network interfaces, calling startup scripts if needed
     for ifn in ${network_interfaces}; do
 	    if [ -e /etc/start_if.${ifn} ]; then