Module Name: src
Committed By: jmcneill
Date: Sun Jan 15 00:25:33 UTC 2012
Modified Files:
src/sys/arch/usermode/conf: GENERIC.amd64 GENERIC.i386
Log Message:
Add options INSECURE, as sysinst requires it. Now I can boot an x86 install
CD image.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/conf/GENERIC.amd64
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/conf/GENERIC.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/GENERIC.amd64
diff -u src/sys/arch/usermode/conf/GENERIC.amd64:1.2 src/sys/arch/usermode/conf/GENERIC.amd64:1.3
--- src/sys/arch/usermode/conf/GENERIC.amd64:1.2 Sat Jan 7 20:44:41 2012
+++ src/sys/arch/usermode/conf/GENERIC.amd64 Sun Jan 15 00:25:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.amd64,v 1.2 2012/01/07 20:44:41 reinoud Exp $
+# $NetBSD: GENERIC.amd64,v 1.3 2012/01/15 00:25:33 jmcneill Exp $
machine usermode
include "arch/usermode/conf/GENERIC.common"
@@ -6,6 +6,8 @@ include "arch/amd64/conf/majors.amd64"
no options EXEC_ELF32
+options INSECURE # required by sysinst
+
options TEXTADDR=0x40000000 # 1 Gb `phys ram' / total space
options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
options NKMEMPAGES_MAX=32768 # 128 Mb max
@@ -14,5 +16,5 @@ makeoptions COPTS+="-m64"
makeoptions LD="ld -melf_amd64"
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.2 $"
+#ident "GENERIC32-$Revision: 1.3 $"
Index: src/sys/arch/usermode/conf/GENERIC.i386
diff -u src/sys/arch/usermode/conf/GENERIC.i386:1.4 src/sys/arch/usermode/conf/GENERIC.i386:1.5
--- src/sys/arch/usermode/conf/GENERIC.i386:1.4 Sat Jan 7 20:44:41 2012
+++ src/sys/arch/usermode/conf/GENERIC.i386 Sun Jan 15 00:25:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.i386,v 1.4 2012/01/07 20:44:41 reinoud Exp $
+# $NetBSD: GENERIC.i386,v 1.5 2012/01/15 00:25:33 jmcneill Exp $
machine usermode
include "arch/usermode/conf/GENERIC.common"
@@ -6,6 +6,8 @@ include "arch/i386/conf/majors.i386"
no options EXEC_ELF64
+options INSECURE # required by sysinst
+
options TEXTADDR=0x40000000 # 1 Gb `phys ram' / total space
options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
options NKMEMPAGES_MAX=32768 # 128 Mb max
@@ -14,5 +16,5 @@ makeoptions COPTS+="-m32"
makeoptions LD="ld -melf_i386"
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.4 $"
+#ident "GENERIC32-$Revision: 1.5 $"
