Revert to use svnd instead of never vnd since USB boot stopped workin…

…g at all with vnd device
kirei · Oct 2, 2011 · bbaf010 · bbaf010
1 parent 1caafd1
commit bbaf010
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ MTREE_CUST=	${.CURDIR}/mtree.conf
 MOUNT_POINT=	/mnt
 SRCDIR?=	/usr/src
 KSRC=		${SRCDIR}/sys
-VND=		vnd0
+VND=		svnd0
 DESTDIR?=	/
 
 # Shouldn't need to touch these

diff --git a/build-diskimage.sh b/build-diskimage.sh
@@ -5,7 +5,7 @@ SRCDIR=${BSDSRCDIR:-/usr/src}
 DESTDIR=${DESTDIR:-${BASE}/sandbox}
 KERNELFILE=${KERNELFILE:-${BASE}/obj/bsd.gz}
 SUDO=sudo
-DEVICE=vnd0
+DEVICE=svnd0
 MOUNTPOINT=/mnt
 TEMPFILE=/tmp/build-diskimage.tmp.$$
 

diff --git a/build-kernel-injail.sh b/build-kernel-injail.sh
@@ -12,7 +12,7 @@ fi
 
 # Cleanup just in case the previous build failed
 umount /mnt
-vnconfig -u vnd0
+vnconfig -u svnd0
 
 make KCONF=${KERNEL} clean
 

diff --git a/build-usbimage.sh b/build-usbimage.sh
@@ -5,7 +5,7 @@ SRCDIR=${BSDSRCDIR:-/usr/src}
 DESTDIR=${DESTDIR:-${BASE}/sandbox}
 KERNELFILE=${KERNELFILE:-${BASE}/obj/bsd.gz}
 SUDO=sudo
-DEVICE=vnd0
+DEVICE=svnd0
 MOUNTPOINT=/mnt
 TEMPFILE=/tmp/build-diskimage.tmp.$$
 

diff --git a/build-usbkernel-injail.sh b/build-usbkernel-injail.sh
@@ -20,7 +20,7 @@ mv list.temp2 list.temp
 
 # Cleanup just in case the previous build failed
 umount /mnt
-vnconfig -u vnd0
+vnconfig -u svnd0
 make KCONF=${KERNEL} clean
 
 # Make kernel