diff options
author | 2014-11-14 15:07:09 +0000 | |
---|---|---|
committer | 2014-11-14 15:07:09 +0000 | |
commit | 68fc99067197b52d37b5b12cea9ce358e30cf195 (patch) | |
tree | e936d8a685d9517788710784675807be0e3e7bab | |
parent | move the trunk related functions out of ifdef SMALL, to allow trunk on (diff) | |
download | wireguard-openbsd-68fc99067197b52d37b5b12cea9ce358e30cf195.tar.xz wireguard-openbsd-68fc99067197b52d37b5b12cea9ce358e30cf195.zip |
enable trunk.
made possible by the install/upgrade changes by krw and the ifconfig
adjustments by me.
ok krw reyk
-rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 3 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 96ac6d1d53f..90076570b0c 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.145 2014/10/10 05:43:35 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.146 2014/11/14 15:07:09 henning Exp $ machine amd64 maxusers 4 @@ -274,6 +274,7 @@ vioscsi* at virtio? # Virtio SCSI device pseudo-device loop 1 pseudo-device vlan +pseudo-device trunk pseudo-device bpfilter 1 pseudo-device rd 1 pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 3fb9e9b614b..2bf97f948ec 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.219 2014/10/10 05:43:35 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.220 2014/11/14 15:07:09 henning Exp $ machine i386 maxusers 4 @@ -332,6 +332,7 @@ vioscsi* at virtio? # Virtio SCSI device pseudo-device loop 1 pseudo-device vlan +pseudo-device trunk pseudo-device bpfilter 1 pseudo-device rd 1 pseudo-device wsmux 2 |