Test for existence of configured tinc networks. This will also make

first install of tinc possible without errors.

diff --git a/debian/init.d b/debian/init.d
index c9a75fc..d2b1497 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,30 +1,21 @@
 #! /usr/bin/perl -w
 #
 # System startup script for tinc
-# $Id: init.d,v 1.3 2000/05/13 00:54:27 zarq Exp $
+# $Id: init.d,v 1.4 2000/05/15 09:41:34 guus Exp $
 #
 
 my $DAEMON="/usr/sbin/tincd";
 my $NAME="tinc";
 my $DESC="tinc daemons";
-my $NETS="test2";
 my $TCONF="/etc/tinc";
-my $EXTRA="-d";
+my $EXTRA="";
 
-if (! -f $DAEMON) { exit 0; }
+# $NETS is a space seperated list of all tinc networks.
+my $NETS="";
 
-# Check the daemon
-if ( ! -x $DAEMON ) {
-    print "**tinc: daemon $DAEMON does not exist or is not executable!\n";
-    exit 1;
-}
-
-# Check the configuration directory
-if ( ! -d $TCONF ) {
-    print "**tinc: configuration directory ($TCONF) not found!\n";
-    exit 1;
-}
+if ("$NETS" eq "") { print "No tinc networks configured."; exit 0; }
 
+if (! -f $DAEMON) { exit 0; }
 
 ##############################################################################
 # vpn_load ()          Loads VPN configuration