Module Name: src
Committed By: christos
Date: Mon Mar 31 18:18:45 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: x86.conf
Log Message:
remove swap; these days x86 machines don't need it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/x86.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.2 src/distrib/utils/embedded/conf/x86.conf:1.3
--- src/distrib/utils/embedded/conf/x86.conf:1.2 Mon Mar 31 13:05:03 2014
+++ src/distrib/utils/embedded/conf/x86.conf Mon Mar 31 14:18:45 2014
@@ -1,28 +1,23 @@
-# $NetBSD: x86.conf,v 1.2 2014/03/31 17:05:03 christos Exp $
+# $NetBSD: x86.conf,v 1.3 2014/03/31 18:18:45 christos Exp $
# x86 shared config
#
image=$HOME/${board}.img
specialdirs="/kern /proc"
-swap=256
extra=8 # spare space
size=0 # autocompute
netbsdid=169
-ffsoffset=$((63 * 512))
+ffsoffset=63b
make_label_x86() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
- local swapsize=$(( ${swap} * 1024 ))
-
local aoffset=63
- local asize=$(( ${totalsize} - ${swapsize} - ${aoffset} ))
-
- local swapoffset=$(( ${aoffset} + ${asize} ))
+ local asize=$(( ${totalsize} - ${aoffset} ))
local bps=512
local spt=32
@@ -52,7 +47,6 @@ drivedata: 0
8 partitions:
# size offset fstype [fsize bsize cpg/sgs]
a: ${asize} ${aoffset} 4.2BSD ${fsize} ${bsize} 0 #
- b: ${swapsize} ${swapoffset} swap #
c: ${totalsize} 0 unused 0 0 #
d: ${totalsize} 0 unused 0 0 #
EOF
@@ -62,8 +56,7 @@ make_fstab_x86_normal() {
cat > ${mnt}/etc/fstab << EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/sd0a / ffs rw,log 1 1
-/dev/sd0b none swap sw 0 0
+/dev/${rootdev}0a / ffs rw,log 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
@@ -77,8 +70,7 @@ make_fstab_x86_minwrites() {
cat > ${mnt}/etc/fstab << EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/sd0a / ffs rw,log,noatime,nodevmtime 1 1
-/dev/sd0b none swap sw 0 0
+/dev/${rootdev}0a / ffs rw,log,noatime,nodevmtime 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
