svn commit: r323437 - in head/release: amd64 arm64 i386 powerpc

[Ed Maste]

Author: emaste
Date: Mon Sep 11 14:35:43 2017
New Revision: 323437
URL: https://svnweb.freebsd.org/changeset/base/323437

Log:
  revert unintentional changes from r323436

Modified:
  head/release/amd64/make-memstick.sh
  head/release/arm64/make-memstick.sh
  head/release/i386/make-memstick.sh
  head/release/powerpc/make-memstick.sh

Modified: head/release/amd64/make-memstick.sh
==============================================================================
--- head/release/amd64/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
+++ head/release/amd64/make-memstick.sh	Mon Sep 11 14:35:43 2017	(r323437)
@@ -32,7 +32,7 @@ fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
 echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
-makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/arm64/make-memstick.sh
==============================================================================
--- head/release/arm64/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
+++ head/release/arm64/make-memstick.sh	Mon Sep 11 14:35:43 2017	(r323437)
@@ -32,7 +32,7 @@ fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
 echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
-makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/i386/make-memstick.sh
==============================================================================
--- head/release/i386/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
+++ head/release/i386/make-memstick.sh	Mon Sep 11 14:35:43 2017	(r323437)
@@ -32,7 +32,7 @@ fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
 echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
-makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/powerpc/make-memstick.sh
==============================================================================
--- head/release/powerpc/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
+++ head/release/powerpc/make-memstick.sh	Mon Sep 11 14:35:43 2017	(r323437)
@@ -37,7 +37,7 @@ fi
 echo '/dev/da0s3 / ufs ro,noatime 1 1' > ${1}/etc/fstab
 echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
 rm -f ${tempfile}
-makefs -B big -o version=2 ${tempfile} ${1}
+makefs -B big ${tempfile} ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local