webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Schweikert
2009-09-08 09:55:37 +02:00
parent 2cb7cef9f8 cb4fdb52ad
commit f47403a4c1
10 changed files with 49 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/kernel/kernel.config.i586-ipfire
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.31
# Fri Aug 21 16:30:37 2009
# Linux kernel version: 2.6.27.31-ipfire
# Mon Sep 7 20:55:55 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -3173,8 +3173,24 @@ CONFIG_CIFS_XATTR=y
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="cp850"
# CONFIG_NLS_CODEPAGE_437 is not set

18
config/kernel/kernel.config.i586-ipfire-xen
View File

@@ -3024,8 +3024,24 @@ CONFIG_CIFS_XATTR=y
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="cp850"
# CONFIG_NLS_CODEPAGE_437 is not set

5
config/rootfiles/common/configroot
View File

@@ -14,8 +14,6 @@ var/ipfire/connscheduler
#var/ipfire/connscheduler/lib.pl
var/ipfire/countries.pl
var/ipfire/crls
var/ipfire/dns
#var/ipfire/dns/settings
var/ipfire/ddns
#var/ipfire/ddns/config
#var/ipfire/ddns/ipcache
@@ -29,6 +27,8 @@ var/ipfire/dhcp
var/ipfire/dhcpc
var/ipfire/dmzholes
#var/ipfire/dmzholes/config
var/ipfire/dns
#var/ipfire/dns/settings
var/ipfire/ethernet
#var/ipfire/ethernet/aliases
#var/ipfire/ethernet/known_nics
@@ -72,6 +72,7 @@ var/ipfire/menu.d/50-firewall.menu
var/ipfire/menu.d/60-ipfire.menu
var/ipfire/menu.d/70-log.menu
#var/ipfire/menu.d/EX-addonsvc.menu
#var/ipfire/menu.d/EX-apcupsd.menu
#var/ipfire/menu.d/EX-asterisk.menu
#var/ipfire/menu.d/EX-bluetooth.menu
#var/ipfire/menu.d/EX-mpfire.menu

1
config/rootfiles/core/31/exclude
View File

@@ -0,0 +1 @@
etc/ipsec.conf

1
config/rootfiles/core/31/filelists/openswan Symbolic link
View File

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