Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/update.sh
This commit is contained in:
Arne Fitzenreiter
2010-09-13 15:57:05 +02:00
4 changed files with 5 additions and 2 deletions

View File

@@ -10,5 +10,5 @@ sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
#none /tmp tmpfs defaults 0 0
none /var/log/rrd tmpfs defaults,size=64M 0 0
none /var/lock tmpfs defaults,size=2M 0 0
none /var/lock tmpfs defaults,size=8M 0 0
none /var/run tmpfs defaults,size=2M 0 0

View File

@@ -1,3 +1,4 @@
lib/openvpn-auth-pam.so
usr/sbin/openvpn
#usr/share/doc/openvpn
#usr/share/man/man8/openvpn.8