[commit] r2372 - in trunk/vendors/Nintendo/common: . rc.d
dslinux_sonny_jim at dslinux.in-berlin.de
dslinux_sonny_jim at dslinux.in-berlin.de
Mon Dec 15 22:56:39 CET 2008
Author: dslinux_sonny_jim
Date: Mon Dec 15 22:56:39 2008
New Revision: 2372
Log:
Simplify inetd rc.d script and enable inetd_config in /etc/rc.defaults
Modified:
trunk/vendors/Nintendo/common/rc.d/inetd
trunk/vendors/Nintendo/common/rc.defaults
Modified: trunk/vendors/Nintendo/common/rc.d/inetd
==============================================================================
--- trunk/vendors/Nintendo/common/rc.d/inetd (original)
+++ trunk/vendors/Nintendo/common/rc.d/inetd Mon Dec 15 22:56:39 2008
@@ -4,30 +4,13 @@
[ -e /etc/rc.conf ] && . /etc/rc.conf
DAEMON=inetd
-default_inetd_config=/etc/inetd.conf
-default_ssh_host_key=/etc/dropbear_rsa_host_key
case "$1" in
start)
if [ ! -f "/var/run/$DAEMON.pid" ]
then
echo "Starting $DAEMON"
- # Set defaults if none specified in /etc/rc.conf
- if [ $inetd_config="" ]
- then
- echo "No inetd.conf specified in rc.conf, using default location"
- INETD_CONF=$default_inetd_config
- else
INETD_CONF=$inetd_config
- fi
-
- if [ $ssh_host_key="" ]
- then
- echo "No ssh hostkey specified in rc.conf, using default location"
- SSH_HOST_KEY=$default_ssh_host_key
- else
- SSH_HOST_KEY=$ssh_host_key
- fi
# Check for existence of config file
if [ ! -f $INETD_CONF ]
Modified: trunk/vendors/Nintendo/common/rc.defaults
==============================================================================
--- trunk/vendors/Nintendo/common/rc.defaults (original)
+++ trunk/vendors/Nintendo/common/rc.defaults Mon Dec 15 22:56:39 2008
@@ -110,8 +110,8 @@
# If you want to start inetd on boot, say "YES" here
# Don't forget to create /etc/inetd.conf!
# To override the default options use:
-# inetd_config="/path/to/inetd.conf"
-# ssh_host_key="/path/to/ssh.key"
+inetd_config="/etc/inetd.conf"
+ssh_host_key="/etc/dropbear_rsa_host_key"
start_inetd="NO"
# To start openvpn on boot say "YES" here
More information about the dslinux-commit
mailing list