--- elwix/config/Attic/ELWIX 2012/10/12 08:22:43 1.4 +++ elwix/config/Attic/ELWIX 2013/01/28 01:47:34 1.5 @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.579 2012/10/01 21:42:32 ken Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.583 2013/01/14 00:28:54 svnexp Exp $ cpu I486_CPU cpu I586_CPU @@ -39,12 +39,13 @@ options SOFTUPDATES # Enable FFS soft updates suppor options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device options NFSCL # New Network Filesystem Client options NFSD # New Network Filesystem Server options NFSCLIENT #Network File System client options NFSSERVER #Network File System server -options MD_ROOT_SIZE=8400 +options MD_ROOT_SIZE=8000 options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem @@ -54,6 +55,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization +options GEOM_GATE options GEOM_UZIP options GEOM_ELI options GEOM_MIRROR @@ -422,6 +424,14 @@ device mmc # MMC/SD bus device mmcsd # MMC/SD memory card device sdhci # Generic PCI SD Host Controller +# VirtIO support +device virtio # Generic VirtIO bus (required) +device virtio_pci # VirtIO PCI device +device vtnet # VirtIO Ethernet device +device virtio_blk # VirtIO Block device +device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device + ### ELWIX Additional custom settings ... device if_bridge @@ -465,7 +475,6 @@ options IPFIREWALL options IPFIREWALL_VERBOSE options IPFIREWALL_VERBOSE_LIMIT=100 options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPFIREWALL_FORWARD options IPFIREWALL_NAT options LIBALIAS options IPDIVERT @@ -578,5 +587,4 @@ options ACCEPT_FILTER_DATA options ACCEPT_FILTER_DNS options ACCEPT_FILTER_HTTP -options ZERO_COPY_SOCKETS options SW_WATCHDOG