20110421 release:

switch from svnd to vnd

bin/ro

@@ -3,7 +3,7 @@
 # To exclude certain vnd partitions from being set to read-write or read-only during 'rw' and 'ro' commands, simply remove those partitions from the vnddirs= setting in /bin/rw and /bin/ro
 
 vnddirs="root bin etc sbin usr"
-dev=svnd0
+dev=vnd0
 
 for i in $vnddirs; do
  sync

bin/rw

@@ -3,7 +3,7 @@
 # To exclude certain vnd partitions from being set to read-write or read-only during 'rw' and 'ro' commands, simply remove those partitions from the vnddirs= setting in /bin/rw and /bin/ro
 
 vnddirs="root bin etc sbin usr"
-dev=svnd0
+dev=vnd0
 
 for i in $vnddirs; do
  mount -oupdate,rw /$i

cfgflashrd

@@ -5,8 +5,8 @@
 # Chris Cappuccio <chris@nmedia.net>
 
 vnddirs="root bin etc sbin usr" # must match vnddirs= in flashrd and stand/rc
-rootdevice=svnd2
-device=svnd3
+rootdevice=vnd2
+device=vnd3
 
 set -A part a d e f g h i j k l m n o p
 
@@ -304,7 +304,7 @@ if [ ! -z "$rdfs" ]; then
    curdisk=${deltoro#/dev/}
    curdisk=${curdisk%a}
    echo Old fstab /flash device $deltoro, new device /dev/"$phys"a
-   # here we assume the physical device for /flash isn't going to overlap with svnd0 or rd0
+   # here we assume the physical device for /flash isn't going to overlap with vnd0 or rd0
    sed -e "s%$deltoro%/dev/"$phys"a%" < $tmpmntvnd/fstab > $temp
    mv $temp $tmpmntvnd/fstab
   else

flashrd

@@ -6,10 +6,10 @@
 
 date=`date +%Y%m%d`
 arch=`uname -m`
-vers=20110303
+vers=20110421
 
-export device=svnd3	# least likely to conflict ?
-export rootdevice=svnd2	# used to mount flash vnd for writing of stuff inside
+export device=vnd3	# least likely to conflict ?
+export rootdevice=vnd2	# used to mount flash vnd for writing of stuff inside
 export blocks=7480	# blocks to reserve for kernel ramdisk
 export szezroot=szez.$arch-$date	# 7480 flash root
 export dest=flashimg.$arch-$date	# final product
@@ -175,7 +175,7 @@ for i in $vnddirs; do
   opts=noatime,nodev,nosuid
   ;;
  }
- echo  "/dev/svnd0${part[$x]}	/$i	ffs	rw,$opts	1 0" >> $tmpfstab
+ echo  "/dev/vnd0${part[$x]}	/$i	ffs	rw,$opts	1 0" >> $tmpfstab
  let x=x+1
 done
 

growimg

@@ -86,9 +86,9 @@ biosboot=/usr/mdec/biosboot
 mbr=/usr/mdec/mbr
 
 if [ -z "$device" ]; then
- device=svnd0
+ device=vnd0
 fi
-device2=svnd1
+device2=vnd1
 image=$4
 
 cylinders=$1

mkboot

@@ -7,7 +7,7 @@
 date=`date +%Y%m%d`
 arch=`uname -m`
 
-[ -z "$rootdevice" ] && export rootdevice=svnd3
+[ -z "$rootdevice" ] && export rootdevice=vnd3
 
 [ -z "$cylinders" ] && cylinders=968 
 

mkdist

@@ -12,7 +12,7 @@ if [ -z "$vnddirs" ]; then
  exit 1
 fi
 if [ -z "$device" ]; then
- device=svnd0
+ device=vnd0
 fi
 
 if [ -z "$1" -a -z "$distloc" ]; then

mkrdroot

@@ -36,7 +36,7 @@
 
 [ -z "$szezroot" ] && szezroot=szez.`uname -m`-`date +%Y%m%d`
 
-[ -z "$device" ] && device=svnd0
+[ -z "$device" ] && device=vnd0
 
 if [ -z "$distloc" -a -z "$1" ]; then
  echo "% mkrdroot <openbsd base>"

stand/rc

@@ -20,9 +20,9 @@
 # this bootstrap could do quite a bit more to check vnd images for validity
 #  and swap to /flash/old as necessary or convenient
 #
-vnddirs="root bin etc sbin usr" # svnd0a, svnd0d, svnd0e, svnd0f, svnd0g
+vnddirs="root bin etc sbin usr" # vnd0a, vnd0d, vnd0e, vnd0f, vnd0g
 set -A part a d e f g h i j k l m n o p
-vnd=svnd0
+vnd=vnd0
 disk=wd0a
 
 export PATH=/bin:/sbin:/stand
@@ -97,16 +97,16 @@ mkvndmnt /flash
 
 if test "$fail" == "1"; then
  if test -f /flash/old/openbsd.vnd; then
-  echo bootstrap: fatal error with svnd, attempting to boot /flash/old
+  echo bootstrap: fatal error with vnd, attempting to boot /flash/old
   unvndmnt
   mkvndmnt /flash/old
   if test "$fail" == "1"; then
    vnconfig -l
-   echo bootstrap: fatal error with svnd, attempting boot anyways
+   echo bootstrap: fatal error with vnd, attempting boot anyways
   fi
  else
   vnconfig -l
-  echo bootstrap: fatal error with svnd, attempting boot anyways
+  echo bootstrap: fatal error with vnd, attempting boot anyways
  fi
 fi