head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.30 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.28 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.26 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.24 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.22 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.20 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.12 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.10 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.8 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.6 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.4 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.2 pkgsrc-2006Q4-base:1.2; locks; strict; comment @# @; 1.2 date 2006.11.05.20.39.46; author rillig; state dead; branches; next 1.1; 1.1 date 2006.11.02.19.15.07; author rillig; state Exp; branches; next ; desc @@ 1.2 log @Removed the patches for the unportable shell scripts, as requested by Manuel Bouyer in PR 34976. Instead, added the files to CHECK_PORTABILITY_SKIP. While here, fixed PKGMANDIR. @ text @$NetBSD: patch-eb,v 1.1 2006/11/02 19:15:07 rillig Exp $ --- examples/block.orig 2006-10-15 14:22:03.000000000 +0200 +++ examples/block 2006-11-02 20:04:06.000000000 +0100 @@@@ -68,7 +68,7 @@@@ check_sharing() local devmm=$(device_major_minor "$dev") local file - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then toskip="^$" else @@@@ -81,7 +81,7 @@@@ check_sharing() then local d=$(device_major_minor "$file") - if [ "$d" == "$devmm" ] + if [ "$d" = "$devmm" ] then echo 'local' return @@@@ -96,9 +96,9 @@@@ check_sharing() do d=$(xenstore_read_default "$base_path/$dom/$dev/physical-device" "") - if [ "$d" == "$devmm" ] + if [ "$d" = "$devmm" ] then - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then if ! same_vm $dom then @@@@ -109,7 +109,7 @@@@ check_sharing() local m=$(xenstore_read "$base_path/$dom/$dev/mode") m=$(canonicalise_mode "$m") - if [ "$m" == 'w' ] + if [ "$m" = 'w' ] then if ! same_vm $dom then @@@@ -138,7 +138,7 @@@@ same_vm() local othervm=$(xenstore_read_default "/local/domain/$otherdom/vm" \ "$FRONTEND_UUID") - [ "$FRONTEND_UUID" == "$othervm" ] + [ "$FRONTEND_UUID" = "$othervm" ] } @@@@ -153,7 +153,7 @@@@ check_device_sharing() local mode=$(canonicalise_mode "$2") local result - if [ "$mode" == '!' ] + if [ "x$mode" = 'x!' ] then return 0 fi @@@@ -202,7 +202,7 @@@@ do_ebusy() local mode="$2" local result="$3" - if [ "$result" == 'guest' ] + if [ "$result" = 'guest' ] then dom='a guest ' when='now' @@@@ -211,7 +211,7 @@@@ do_ebusy() when='by a guest' fi - if [ "$mode" == 'w' ] + if [ "$mode" = 'w' ] then m1='' m2='' @@@@ -266,7 +266,7 @@@@ case "$command" in claim_lock "block" - if [ "$mode" == 'w' ] && ! stat "$file" -c %A | grep -q w + if [ "$mode" = 'w' ] && ! stat "$file" -c %A | grep -q w then release_lock "block" ebusy \ @@@@ -287,7 +287,7 @@@@ mount it read-write in a guest domain." if [ "$f" ] then # $dev is in use. Check sharing. - if [ "$mode" == '!' ] + if [ "x$mode" = 'x!' ] then continue fi @@@@ -307,7 +307,7 @@@@ mount it read-write in a guest domain." do d=$(xenstore_read_default \ "$XENBUS_BASE_PATH/$dom/$domdev/node" "") - if [ "$d" == "$dev" ] + if [ "$d" = "$dev" ] then f=$(xenstore_read "$XENBUS_BASE_PATH/$dom/$domdev/params") found=1 @@@@ -347,7 +347,7 @@@@ mount it read-write in a guest domain." f=$(readlink -f "$f" || echo $(dirname "$file")/$(basename "$f")) - if [ "$f" == "$file" ] + if [ "$f" = "$file" ] then check_file_sharing "$file" "$dev" "$mode" fi @@@@ -355,14 +355,14 @@@@ mount it read-write in a guest domain." # $dev is not in use, so we'll remember it for use later; we want # to finish the sharing check first. - if [ "$loopdev" == '' ] + if [ "$loopdev" = '' ] then loopdev="$dev" fi fi done - if [ "$loopdev" == '' ] + if [ "$loopdev" = '' ] then fatal 'Failed to find an unused loop device' fi @ 1.1 log @Fixed "test ==" and some other bugs, as reported in PR 34976. The quality of the shell scripts is not too good ... @ text @d1 1 a1 1 $NetBSD$ @