From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 1 Jul 2012 12:59:32 +0000 (+0000)
Subject: xl2tpd: remove module loading from init script
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=0faa243f8e14fa77f9f982aba46c337bc4c80787;p=packages.git

xl2tpd: remove module loading from init script

Remove module loading from xl2tpd init-script now that module gets loaded
properly during boot (since that was already fixed in #32562, this partly
reverts #32563)

Signed-off-by: Daniel Golle <dgolle@allnet.de>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32574 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/xl2tpd/files/xl2tpd.init b/net/xl2tpd/files/xl2tpd.init
index bdee61547..22e845901 100644
--- a/net/xl2tpd/files/xl2tpd.init
+++ b/net/xl2tpd/files/xl2tpd.init
@@ -8,16 +8,6 @@ RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
 
 start() {
-	# make sure kernel modules are loaded before starting xl2tpd, otherwise
-	# kernel-mode l2tp support won't work
-	local load
-	for module in slhc ppp_generic ppp_async pppox l2tp_core l2tp_netlink l2tp_ppp ; do
-		grep -q "$module" /proc/modules && continue
-		/sbin/insmod $module 2>&- >&-
-		load=1
-	done
-	[ "$load" = "1" ] && sleep 1
-
 	mkdir -p $RUN_D/$BIN
 	[ -f $DEFAULT ] && . $DEFAULT
 	$BIN $OPTIONS