diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-11-14 15:07:10 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-11-14 15:07:10 +0000 |
| commit | 9c0a0bec992ddaf698edf24457a294d4a2a9f4f6 (patch) | |
| tree | 7c97d637b49341bdc5be3551904df8f24744ee67 /sys/arch | |
| parent | a48648f599933bec66b4b61b8fa418df18fdc039 (diff) | |
enable trunk.
made possible by the install/upgrade changes by krw and the ifconfig
adjustments by me.
ok krw reyk
Diffstat (limited to 'sys/arch')
| -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 |