diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-20 16:12:08 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-20 16:12:08 +0000 |
| commit | a7580582449de60f9e9dc9e4933e661bfe9b22a7 (patch) | |
| tree | c3de88803b2c204b1333e65aa2b614dda179b78d /sys/arch/i386/conf | |
| parent | fcac0f193ef64005c14563e5e13df80c6fd607ff (diff) | |
Disable apm(4) on the floppy ramdisk and keep the cd one in sync.
This allows FFS2 to be enabled. Has been in snaps for quite some days.
With and ok deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index a7d7664639d..120ec77b640 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.195 2019/09/04 14:29:41 cheloha Exp $ +# $OpenBSD: RAMDISK,v 1.196 2020/03/20 16:12:07 otto Exp $ machine i386 maxusers 4 @@ -14,6 +14,7 @@ option PCIVERBOSE option SCSITERSE option FFS +option FFS2 option MSDOSFS config bsd root on rd0a swap on rd0b and wd0b and sd0b @@ -36,7 +37,7 @@ acpimadt0 at acpi? cpu0 at mainbus? bios0 at mainbus0 ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +#apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 mpbios0 at bios0 pcibios0 at bios0 flags 0x0000 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 9c51010a296..74685af95c4 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.241 2019/11/19 02:01:58 kevlo Exp $ +# $OpenBSD: RAMDISK_CD,v 1.242 2020/03/20 16:12:07 otto Exp $ machine i386 maxusers 4 @@ -47,7 +47,7 @@ mpbios0 at bios0 cpu0 at mainbus? bios0 at mainbus0 ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +#apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 pcibios0 at bios0 flags 0x0000 isa0 at mainbus0 |