From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 1/3] Debian: erase-other-disks: add a log() helper Date: Wed, 20 Jan 2016 15:06:19 +0000 Message-ID: <1453302381-28692-1-git-send-email-ian.campbell@citrix.com> References: <1453302359.26343.133.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1453302359.26343.133.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org Writing it out each time is too verbose. At the same time log the set of devices present before and after each batch of erasing, with a udev settle before the second to ensure any changes to /dev have happened. Signed-off-by: Ian Campbell --- Osstest/Debian.pm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 76171c0..cf3486b 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1033,22 +1033,29 @@ if test -f \$stamp; then exit 0 fi >\$stamp -logger -t osstest-erase-other-disks-\$\$ "Running..." + +log () { + logger -t osstest-erase-other-disks-\$\$ "\$\@" +} + +log "Running..." + zero () { if test -b \$dev; then - logger -t osstest-erase-other-disks-\$\$ "Erasing \$dev" + log "Erasing \$dev" dd if=/dev/zero of=\$dev count=64 ||: if ! test -b \$dev; then - logger -t osstest-erase-other-disks-\$\$ "\$dev is no longer a block device!" + log "\$dev is no longer a block device!" exit 1 fi else - logger -t osstest-erase-other-disks-\$\$ "\$dev does not exist or is not a block device." + log "\$dev does not exist or is not a block device." fi } udevadm settle for sd in sd hd; do + log "\${sd} devices present before: `echo /dev/\${sd}*`" for b in a b c d e f; do dev=/dev/\${sd}\${b} zero @@ -1056,6 +1063,8 @@ for sd in sd hd; do for dev in /dev/\${sd}a[0-9]; do zero done + udevadm settle + log "\${sd} devices present after: `echo /dev/\${sd}*`" done for dev in ${disk}*; do zero -- 2.6.1