Merge branch 'master' into dracut

This commit is contained in:
Michael Tremer
2010-07-22 12:49:08 +02:00
15 changed files with 64 additions and 9 deletions

View File

@@ -22,6 +22,7 @@ var/ipfire/ddns
var/ipfire/dhcp
#var/ipfire/dhcp/advoptions
#var/ipfire/dhcp/advoptions-list
#var/ipfire/dhcp/dhcpd.conf.local
#var/ipfire/dhcp/fixleases
#var/ipfire/dhcp/settings
var/ipfire/dhcpc