Date: Wed, 30 Mar 2016 08:32:38 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r297414 - user/pho/stress2/misc Message-ID: <201603300832.u2U8Wc5w069565@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Wed Mar 30 08:32:38 2016 New Revision: 297414 URL: https://svnweb.freebsd.org/changeset/base/297414 Log: Cleanup of scripts. Sponsored by: EMC / Isilon Storage Division Modified: user/pho/stress2/misc/msdos.sh user/pho/stress2/misc/msdos2.sh user/pho/stress2/misc/msdos3.sh Modified: user/pho/stress2/misc/msdos.sh ============================================================================== --- user/pho/stress2/misc/msdos.sh Wed Mar 30 07:29:52 2016 (r297413) +++ user/pho/stress2/misc/msdos.sh Wed Mar 30 08:32:38 2016 (r297414) @@ -40,15 +40,15 @@ mdconfig -l | grep -q ${mdstart} && mdc mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md${mdstart} auto -newfs_msdos /dev/md${mdstart}a > /dev/null -mount -t msdosfs /dev/md${mdstart}a $mntpoint +newfs_msdos /dev/md${mdstart}$part > /dev/null +mount -t msdosfs /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd ..; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) while mount | grep "$mntpoint" | grep -q md$mdstart; do umount $mntpoint || sleep 1 done -fsck -t msdosfs -y /dev/md${mdstart}a +fsck -t msdosfs -y /dev/md${mdstart}$part mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/msdos2.sh ============================================================================== --- user/pho/stress2/misc/msdos2.sh Wed Mar 30 07:29:52 2016 (r297413) +++ user/pho/stress2/misc/msdos2.sh Wed Mar 30 08:32:38 2016 (r297414) @@ -42,15 +42,15 @@ mdconfig -l | grep -q $mdstart && mdcon mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md${mdstart} auto -newfs_msdos /dev/md${mdstart}a > /dev/null -mount -t msdosfs /dev/md${mdstart}a $mntpoint +newfs_msdos /dev/md${mdstart}$part > /dev/null +mount -t msdosfs /dev/md${mdstart}$part $mntpoint u=$((mdstart + 1)) mdconfig -l | grep -q $u && mdconfig -d -u $u mdconfig -a -t swap -s 1g -u $u bsdlabel -w md${u} auto -newfs_msdos /dev/md${u}a > /dev/null -mount -u /dev/md${u}a $mntpoint > /dev/null 2>&1 # panic +newfs_msdos /dev/md${u}$part > /dev/null +mount -u /dev/md${u}$part $mntpoint > /dev/null 2>&1 # panic ls $mntpoint > /dev/null Modified: user/pho/stress2/misc/msdos3.sh ============================================================================== --- user/pho/stress2/misc/msdos3.sh Wed Mar 30 07:29:52 2016 (r297413) +++ user/pho/stress2/misc/msdos3.sh Wed Mar 30 08:32:38 2016 (r297414) @@ -42,10 +42,10 @@ mdconfig -l | grep -q $mdstart && mdcon mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md${mdstart} auto -newfs_msdos /dev/md${mdstart}a > /dev/null +newfs_msdos /dev/md${mdstart}$part > /dev/null -mount -t msdosfs /dev/md${mdstart}a $mntpoint -mount -t msdosfs /dev/md${mdstart}a $mntpoint || echo OK +mount -t msdosfs /dev/md${mdstart}$part $mntpoint +mount -t msdosfs /dev/md${mdstart}$part $mntpoint || echo OK ls $mntpoint > /dev/null
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603300832.u2U8Wc5w069565>