r1983 - in trunk

dslinux_gpf at dslinux.in-berlin.de dslinux_gpf at dslinux.in-berlin.de
Thu Oct 11 01:45:53 CEST 2007


Author: gpf
Date: 2007-10-11 01:45:47 +0200 (Thu, 11 Oct 2007)
New Revision: 1983

Log:
openvpn for DSLinux, Patch contributed by Ewan Meadows

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/config/Configure.help	2007-10-10 23:45:47 UTC (rev 1983)
@@ -592,6 +592,12 @@
 CONFIG_USER_OPENSWAN
   The Openswan tools and applications
 
+CONFIG_USER_OPENVPN
+  OpenVPN is a full-featured SSL VPN solution which can accomodate a wide 
+  range of configurations, including remote access, site-to-site VPNs, WiFi 
+  security, and enterprise-scale remote access solutions with load balancing, 
+  failover, and fine-grained access-controls
+
 CONFIG_USER_PING_PING
   Diagnostic tool for testing network connections.
   Approx. binary size: 27k

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/config/config.in	2007-10-10 23:45:47 UTC (rev 1983)
@@ -504,6 +504,7 @@
 if [ "$CONFIG_USER_OPENSSL_APPS" = "y" ]; then
 	define_bool	CONFIG_LIB_LIBSSL y
 fi
+bool 'openvpn'			CONFIG_USER_OPENVPN
 
 bool 'ping'			CONFIG_USER_PING_PING
 bool 'plugdaemon'		CONFIG_USER_PLUG_PLUG

Copied: trunk/user/openvpn/src (from rev 1982, tags/openvpn/openvpn-2.0.9)

Modified: trunk/vendors/Nintendo/DLDI/Makefile
===================================================================
--- trunk/vendors/Nintendo/DLDI/Makefile	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/vendors/Nintendo/DLDI/Makefile	2007-10-10 23:45:47 UTC (rev 1983)
@@ -11,7 +11,7 @@
 
 ROMFS_DIRS := boot dev proc sbin $(FATFS)/linux $(OPTDIR) tmp 
 
-FS_DIRS := etc/rc.d home lib usr/bin usr/games usr/lib usr/share/udhcpc var/tmp var/run
+FS_DIRS := etc/rc.d home lib usr/bin usr/games usr/lib usr/share/udhcpc var/tmp var/run var/log
 
 DEVICES := \
 	tty,c,5,0      console,c,5,1      cua0,c,5,64      cua1,c,5,65  \
@@ -40,6 +40,7 @@
 	\
 	mtd0,c,90,0    firmware,c,90,2 \
 	\
+	tun,c,10,200 \
 	tty0,c,4,0     tty1,c,4,1         tty2,c,4,2       tty3,c,4,3 \
 	tty4,c,4,4     tty5,c,4,5         tty6,c,4,6       tty7,c,4,7 \
 	\

Modified: trunk/vendors/Nintendo/DLDI/config.linux-2.6.x
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.linux-2.6.x	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/vendors/Nintendo/DLDI/config.linux-2.6.x	2007-10-10 23:45:47 UTC (rev 1983)
@@ -393,7 +393,7 @@
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=y
 
 #
 # PHY device support

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-10 23:45:47 UTC (rev 1983)
@@ -262,6 +262,7 @@
 # CONFIG_USER_NTPD_NTPDATE is not set
 # CONFIG_USER_NTPD_NTPQ is not set
 # CONFIG_USER_OPENSSL_APPS is not set
+CONFIG_USER_OPENVPN=y
 CONFIG_USER_PING_PING=y
 # CONFIG_USER_PLUG_PLUG is not set
 # CONFIG_USER_POP3PROXY_POP3PROXY is not set

Modified: trunk/vendors/Nintendo/common/rc.common
===================================================================
--- trunk/vendors/Nintendo/common/rc.common	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/vendors/Nintendo/common/rc.common	2007-10-10 23:45:47 UTC (rev 1983)
@@ -54,6 +54,16 @@
 	fi
 fi
 
+if [ "$start_openvpn" = "YES" ]
+then
+	if [ "$__network_up" = "YES" ]
+	then
+		/etc/rc.d/openvpn start
+	else
+		echo "Not starting openvpn: network is down"
+	fi
+fi
+
 # set hostname
 hostname $hostname
 

Modified: trunk/vendors/Nintendo/common/rc.defaults
===================================================================
--- trunk/vendors/Nintendo/common/rc.defaults	2007-10-10 23:12:06 UTC (rev 1982)
+++ trunk/vendors/Nintendo/common/rc.defaults	2007-10-10 23:45:47 UTC (rev 1983)
@@ -111,6 +111,10 @@
 # Don't forget to edit /etc/inetd.conf!
 start_inetd="NO"
 
+# To start openvpn on boot say "YES" here
+# Please read /etc/openvpn.conf.example
+start_openvpn="NO"
+
 # If you want to see your DS firmware version on boot,
 # set this to "YES". By default, the firmware version is shown.
 show_firmware_version="YES"




More information about the dslinux-commit mailing list