svn commit: r197027 - projects/stress2/misc
Peter Holm
pho at FreeBSD.org
Wed Sep 9 10:13:56 UTC 2009
Author: pho
Date: Wed Sep 9 10:13:56 2009
New Revision: 197027
URL: http://svn.freebsd.org/changeset/base/197027
Log:
Use bsdlabel and not disklabel in all test scenarios.
Modified:
projects/stress2/misc/extattr.sh
projects/stress2/misc/extattrctl.sh
projects/stress2/misc/mac_chkexec.sh
projects/stress2/misc/md.sh
projects/stress2/misc/mount2.sh
projects/stress2/misc/mountro3.sh
projects/stress2/misc/newfs.sh
projects/stress2/misc/newfs4.sh
projects/stress2/misc/quota1.sh
projects/stress2/misc/quota10.sh
projects/stress2/misc/quota2.sh
projects/stress2/misc/quota3.sh
projects/stress2/misc/quota4.sh
projects/stress2/misc/quota6.sh
projects/stress2/misc/quota7.sh
projects/stress2/misc/quota8.sh
projects/stress2/misc/quota9.sh
projects/stress2/misc/snap8.sh
projects/stress2/misc/umount.sh
projects/stress2/misc/umountf.sh
projects/stress2/misc/umountf2.sh
projects/stress2/misc/umountf3.sh
projects/stress2/misc/umountf4.sh
projects/stress2/misc/unionfs.sh
projects/stress2/misc/unionfs3.sh
Modified: projects/stress2/misc/extattr.sh
==============================================================================
--- projects/stress2/misc/extattr.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/extattr.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -47,7 +47,7 @@ mount | grep "${mntpoint}" | grep -q md$
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 20m -u $mdstart
-disklabel -r -w md$mdstart auto
+bsdlabel -w md$mdstart auto
newfs -O 2 md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/extattrctl.sh
==============================================================================
--- projects/stress2/misc/extattrctl.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/extattrctl.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -48,7 +48,7 @@ mount | grep "${mntpoint}" | grep -q md$
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 20m -u $mdstart
-disklabel -r -w md$mdstart auto
+bsdlabel -w md$mdstart auto
newfs -O 1 md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/mac_chkexec.sh
==============================================================================
--- projects/stress2/misc/mac_chkexec.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/mac_chkexec.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep -q md$
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 12m -u $mdstart
-disklabel -r -w md$mdstart auto
+bsdlabel -w md$mdstart auto
newfs md${mdstart}${part} > /dev/null
tunefs -l enable /dev/md${mdstart}${part}
Modified: projects/stress2/misc/md.sh
==============================================================================
--- projects/stress2/misc/md.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/md.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -39,7 +39,7 @@ mount | grep "${mntpoint}" | grep md${md
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t swap -s 2m -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} ${mntpoint}
Modified: projects/stress2/misc/mount2.sh
==============================================================================
--- projects/stress2/misc/mount2.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/mount2.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -47,7 +47,7 @@ if [ $# -eq 0 ]; then
dd if=/dev/zero of=$D$m bs=1m count=1 > /dev/null 2>&1
mdconfig -a -t vnode -f $D$m -u $m
- disklabel -r -w md$m auto
+ bsdlabel -w md$m auto
newfs md${m}${part} > /dev/null 2>&1
done
Modified: projects/stress2/misc/mountro3.sh
==============================================================================
--- projects/stress2/misc/mountro3.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/mountro3.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -42,7 +42,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/newfs.sh
==============================================================================
--- projects/stress2/misc/newfs.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/newfs.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $diskimage -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
for opt in "-O1" "-O2" "-O2 -U"; do
Modified: projects/stress2/misc/newfs4.sh
==============================================================================
--- projects/stress2/misc/newfs4.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/newfs4.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -55,7 +55,7 @@ truncate -s ${size}G $diskimage
blocksize="-b 65536"
opt="-O2 -U"
mdconfig -a -t vnode -f $diskimage -u $mdstart
-disklabel -r -w md$mdstart auto
+bsdlabel -w md$mdstart auto
newfs $blocksize $opt md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/quota1.sh
==============================================================================
--- projects/stress2/misc/quota1.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota1.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -43,7 +43,7 @@ mount | grep "${mntpoint}" | grep md${md
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} ${mntpoint}
export RUNDIR=${mntpoint}/stressX
Modified: projects/stress2/misc/quota10.sh
==============================================================================
--- projects/stress2/misc/quota10.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota10.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -48,7 +48,7 @@ if [ $# -eq 0 ]; then
dede $D$m 1m 1
mdconfig -a -t vnode -f $D$m -u $m
- disklabel -r -w md$m auto
+ bsdlabel -w md$m auto
newfs md${m}${part} > /dev/null 2>&1
echo "/dev/md${m}${part} ${mntpoint}$m ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}$m
Modified: projects/stress2/misc/quota2.sh
==============================================================================
--- projects/stress2/misc/quota2.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota2.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep md${md
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
Modified: projects/stress2/misc/quota3.sh
==============================================================================
--- projects/stress2/misc/quota3.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota3.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep md${md
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
Modified: projects/stress2/misc/quota4.sh
==============================================================================
--- projects/stress2/misc/quota4.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota4.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -42,7 +42,7 @@ mount | grep "${mntpoint}" | grep md${md
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
Modified: projects/stress2/misc/quota6.sh
==============================================================================
--- projects/stress2/misc/quota6.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota6.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n
mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0
mdconfig -a -t vnode -f $D -u 0
-disklabel -r -w md0 auto
+bsdlabel -w md0 auto
newfs -U md0c > /dev/null
echo "/dev/md0c /mnt ufs rw,userquota 2 2" >> /etc/fstab
mount /mnt
Modified: projects/stress2/misc/quota7.sh
==============================================================================
--- projects/stress2/misc/quota7.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota7.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -41,7 +41,7 @@ mount | grep "/mnt" | grep -q md0 && umo
mdconfig -l | grep -q md0 && mdconfig -d -u 0
mdconfig -a -t vnode -f $D -u 0
-disklabel -r -w md0 auto
+bsdlabel -w md0 auto
newfs -U md0c > /dev/null
echo "/dev/md0c /mnt ufs rw,userquota 2 2" >> /etc/fstab
mount /mnt
Modified: projects/stress2/misc/quota8.sh
==============================================================================
--- projects/stress2/misc/quota8.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota8.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -43,7 +43,7 @@ mount | grep "${mntpoint}" | grep -q md$
mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
Modified: projects/stress2/misc/quota9.sh
==============================================================================
--- projects/stress2/misc/quota9.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/quota9.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -50,7 +50,7 @@ if [ $# -eq 0 ]; then
mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
- disklabel -r -w md${mdstart} auto
+ bsdlabel -w md${mdstart} auto
newfs -U md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
Modified: projects/stress2/misc/snap8.sh
==============================================================================
--- projects/stress2/misc/snap8.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/snap8.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -49,7 +49,7 @@ size=25 # Gb
truncate -s ${size}G $diskimage
mdconfig -a -t vnode -f $diskimage -u $mdstart
-disklabel -r -w md$mdstart auto
+bsdlabel -w md$mdstart auto
newfs -O2 -U md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/umount.sh
==============================================================================
--- projects/stress2/misc/umount.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/umount.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs md${mdstart}${part}
mount /dev/md${mdstart}${part} $mntpoint
export RUNDIR=$mntpoint/stressX
Modified: projects/stress2/misc/umountf.sh
==============================================================================
--- projects/stress2/misc/umountf.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/umountf.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs md${mdstart}${part}
mount /dev/md${mdstart}${part} $mntpoint
Modified: projects/stress2/misc/umountf2.sh
==============================================================================
--- projects/stress2/misc/umountf2.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/umountf2.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -48,7 +48,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
df -ih $mntpoint
Modified: projects/stress2/misc/umountf3.sh
==============================================================================
--- projects/stress2/misc/umountf3.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/umountf3.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -50,7 +50,7 @@ mount | grep "$mntpoint" | grep md${mdst
mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart}
mdconfig -a -t vnode -f $D -u ${mdstart}
-disklabel -r -w md${mdstart} auto
+bsdlabel -w md${mdstart} auto
newfs md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
#newfs_msdos -F 32 -b 8192 /dev/md${mdstart}a
Modified: projects/stress2/misc/umountf4.sh
==============================================================================
--- projects/stress2/misc/umountf4.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/umountf4.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -47,7 +47,7 @@ if [ $# -eq 0 ]; then
dede $D$m 1m 10
mdconfig -a -t vnode -f $D$m -u $m
- disklabel -r -w md$m auto
+ bsdlabel -w md$m auto
newfs md${m}${part} > /dev/null 2>&1
done
Modified: projects/stress2/misc/unionfs.sh
==============================================================================
--- projects/stress2/misc/unionfs.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/unionfs.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n
mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0
mdconfig -a -t vnode -f $D -u 0
-disklabel -r -w md0 auto
+bsdlabel -w md0 auto
newfs -U md0c > /dev/null
mount /dev/md0c /mnt
mount -t unionfs -o noatime /mnt /tmp
Modified: projects/stress2/misc/unionfs3.sh
==============================================================================
--- projects/stress2/misc/unionfs3.sh Wed Sep 9 10:05:50 2009 (r197026)
+++ projects/stress2/misc/unionfs3.sh Wed Sep 9 10:13:56 2009 (r197027)
@@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n
mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0
mdconfig -a -t vnode -f $D -u 0
-disklabel -r -w md0 auto
+bsdlabel -w md0 auto
newfs -U md0c > /dev/null
mount /dev/md0c /mnt
mount -t unionfs -o noatime /tmp /mnt
More information about the svn-src-projects
mailing list