Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/packages/miniupnpd
This commit is contained in:
Michael Tremer
2010-11-28 21:01:11 +01:00
6 changed files with 15 additions and 8 deletions

View File

@@ -1,13 +1,13 @@
sbin/dhcpcd
#var/ipfire/dhcpc
#usr/share/man/man5/dhcpcd.conf.5
#usr/share/man/man8/dhcpcd-run-hooks.8
#usr/share/man/man8/dhcpcd.8
var/ipfire/dhcpc/dhcpcd-hooks
#var/ipfire/dhcpc/dhcpcd-hooks/01-test
#var/ipfire/dhcpc/dhcpcd-hooks/02-dump
#var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
#var/ipfire/dhcpc/dhcpcd-hooks/29-lookup-hostname
#var/ipfire/dhcpc/dhcpcd-hooks/30-hostname
#var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe
var/ipfire/dhcpc/dhcpcd-run-hooks
#usr/share/man/man5/dhcpcd.conf.5
#usr/share/man/man8/dhcpcd-run-hooks.8
#usr/share/man/man8/dhcpcd.8
var/ipfire/dhcpc/dhcpcd.conf

View File

@@ -0,0 +1 @@
../../../common/dhcpcd

View File

@@ -1,7 +1,7 @@
etc/init.d/firewall
etc/system-release
etc/rc.d/init.d/checkfs
etc/rc.d/init.d/checkfstab
etc/rc.d/init.d/firewall
etc/rc.d/init.d/squid
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/speed.cgi

View File

@@ -0,0 +1 @@
../../../common/fireinfo