mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
Conflicts: config/rootfiles/packages/miniupnpd
This commit is contained in:
@@ -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
|
||||
|
||||
1
config/rootfiles/core/43/filelists/dhcpcd
Symbolic link
1
config/rootfiles/core/43/filelists/dhcpcd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/dhcpcd
|
||||
@@ -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
|
||||
|
||||
1
config/rootfiles/core/43/filelists/fireinfo
Symbolic link
1
config/rootfiles/core/43/filelists/fireinfo
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/fireinfo
|
||||
Reference in New Issue
Block a user