[Initng-svn] r3191 - initng/trunk/initfiles/daemon

[svn at initng.thinktux.net]

Author: deac
Date: Sat Mar  4 14:51:28 2006
New Revision: 3191

Modified:
   initng/trunk/initfiles/daemon/Makefile.am
   initng/trunk/initfiles/daemon/pppoe.ii
Log:
daemon/dhclient-old removed, daemon/adsl => daemon/pppoe

Modified: initng/trunk/initfiles/daemon/Makefile.am
==============================================================================
--- initng/trunk/initfiles/daemon/Makefile.am	(original)
+++ initng/trunk/initfiles/daemon/Makefile.am	Sat Mar  4 14:51:28 2006
@@ -9,7 +9,6 @@
 	NetworkManager.ii \
 	NetworkManagerDispatcher.ii \
 	acpid.ii \
-	adsl.ii \
 	agetty.ii \
 	apache.ii \
 	apache2.ii \
@@ -27,7 +26,6 @@
 	dbus.ii \
 	dcron.ii \
 	denyhosts.ii \
-	dhclient-old.ii \
 	dhclient.ii \
 	dhcpcd.ii \
 	dhcpd.ii \
@@ -65,6 +63,7 @@
 	mdnsd.ii \
 	metalog.ii \
 	mingetty.ii \
+	mldonkey.ii \
 	mpd.ii \
 	mysql.ii \
 	nagios.ii \
@@ -80,6 +79,7 @@
 	postfix.ii \
 	postgres.ii \
 	powernowd.ii \
+	pppoe.ii \
 	printconf.ii \
 	privoxy.ii \
 	proftpd.ii \
@@ -114,7 +114,6 @@
 	xinetd.ii \
 	dovecot.ii \
 	vdradmind.ii \
-	vdr.ii \
-	mldonkey.ii
+	vdr.ii
 
 EXTRA_DIST = $(iifiles)

Modified: initng/trunk/initfiles/daemon/pppoe.ii
==============================================================================
--- initng/trunk/initfiles/daemon/pppoe.ii	(original)
+++ initng/trunk/initfiles/daemon/pppoe.ii	Sat Mar  4 14:51:28 2006
@@ -1,6 +1,6 @@
 service daemon/adsl {
 	need = system/mountfs system/modules system/hostname net/eth0;
 	use = system/modules system/coldplug;
-	exec start = @adsl-start@;
-	exec stop = @adsl-stop@;
+	exec start = @adsl-start:pppoe-start@;
+	exec stop = @adsl-stop:pppoe-stop@;
 }