A bit of a cleanup of common.config and add new QA host.
authorDavid Disseldorp <ddiss@sgi.com>
Fri, 20 Apr 2007 03:59:08 +0000 (03:59 +0000)
committerDavid Disseldorp <ddiss@sgi.com>
Fri, 20 Apr 2007 03:59:08 +0000 (03:59 +0000)
Merge of master-melb:xfs-cmds:28444a by kenmcd.

common.config

index 27d3a136c67b0a74c764e4dc1a0ad734cffdd956..7c9e8fa8cc2f4f946330dc83167e3fb8fb5303db 100644 (file)
@@ -4,22 +4,22 @@
 #
 # setup and check for config parameters, and in particular
 #
-# TEST_DIR             - scratch test directory that is in an already
-#                        mounted XFS file system, needs to be be world
-#                        writeable
-# TEST_DEV             - device for file system containing TEST_DIR
-# SCRATCH_DEV          - device you can make a scratch file system on
-# SCRATCH_MNT          - mount point for scratch file system
+# TEST_DIR -        scratch test directory that is in an already
+#                   mounted XFS file system, needs to be be world
+#                   writeable
+# TEST_DEV -        device for file system containing TEST_DIR
+# SCRATCH_DEV -     device you can make a scratch file system on
+# SCRATCH_MNT -     mount point for scratch file system
 #
 # and optionally:
-# SCRATCH_LOGDEV       - scratch log device for external log testing
-# SCRATCH_RTDEV                - scratch rt dev
-# TEST_LOGDEV          - test log device for external log testing
-# TEST_RTDEV           - test rt dev
-# TAPE_DEV             - the tape device for the xfsdump tests
-# RMT_TAPE_DEV         - the remote tape device for the xfsdump tests
-# RMT_IRIXTAPE_DEV     - the IRIX remote tape device for the xfsdump tests
-# RMT_TAPE_USER                - remote user for tape device
+# SCRATCH_LOGDEV  scratch log device for external log testing
+# SCRATCH_RTDEV -   scratch rt dev
+# TEST_LOGDEV -     test log device for external log testing
+# TEST_RTDEV -      test rt dev
+# TAPE_DEV -        the tape device for the xfsdump tests
+# RMT_TAPE_DEV -    the remote tape device for the xfsdump tests
+# RMT_IRIXTAPE_DEV- the IRIX remote tape device for the xfsdump tests
+# RMT_TAPE_USER -   remote user for tape device
 #
 # - These can be added to known_hosts() below or a separate local
 #   configuration file can be used (using the HOST_OPTIONS variable).
@@ -31,7 +31,7 @@
 #
 
 # Warning: don't put freeware before /usr/bsd on IRIX coz you'll
-#          get the wrong hostname and set your system name to -s  :)
+#  get the wrong hostname and set your system name to -s  :)
 [ -d /usr/bsd ] && PATH=$PATH:/usr/bsd
 [ -d /usr/freeware/bin ] && PATH=$PATH:/usr/freeware/bin
 PATH=".:$PATH"
@@ -40,15 +40,15 @@ HOST=`hostname -s`
 HOSTOS=`uname -s`
 [ "$HOSTOS" = "IRIX64" ] && HOSTOS="IRIX"
 
-MODULAR=0              # using XFS as a module or not
-BOOT="/boot"           # install target for kernels
+MODULAR=0# using XFS as a module or not
+BOOT="/boot"# install target for kernels
 export EXTRA=${EXTRA:=xfs-qa}
 
 # general parameters (mainly for auto-qa)
-SOAK_PROC=3            # -p option to fsstress
-SOAK_STRESS=10000      # -n option to fsstress
-SOAK_PASSES=-1         # count of repetitions of fsstress (while soaking)
-EMAIL=root@localhost   # where auto-qa will send its status messages
+SOAK_PROC=3# -p option to fsstress
+SOAK_STRESS=10000# -n option to fsstress
+SOAK_PASSES=-1# count of repetitions of fsstress (while soaking)
+EMAIL=root@localhost# where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
 export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
@@ -63,23 +63,20 @@ export LOCAL_CONFIGURE_OPTIONS=${LOCAL_CONFIGURE_OPTIONS:=--enable-readline=yes}
 set_prog_path()
 {
     p=`which $1 2> /dev/null`
-    if [ -n "$p" -a -x "$p" ]
-    then
-       echo $p
-       return 0
+    if [ -n "$p" -a -x "$p" ]; then
+        echo $p
+        return 0
     fi
     p=$1
-
+    
     shift
-    for f
-    do
-       if [ -x $f ]
-       then
-           echo $f
-           return 0
-       fi
+    for f; do
+        if [ -x $f ]; then
+            echo $f
+            return 0
+        fi
     done
-
+    
     echo ""
     return 1
 }
@@ -132,430 +129,448 @@ export XFS_PARALLEL_REPAIR64_PROG="`set_prog_path xfs_prepair64`"
 
 case "$HOSTOS" in
     IRIX*)
-          export MKFS_XFS_PROG="`set_prog_path mkfs_xfs`"
-          export MKFS_UDF_PROG="`set_prog_path mkfs_udf`"
-          export XFS_FSR_PROG="`set_prog_path /usr/etc/fsr_xfs`"
-          export MKFS_NFS_PROG="false"
-          ;;
+        export MKFS_XFS_PROG="`set_prog_path mkfs_xfs`"
+        export MKFS_UDF_PROG="`set_prog_path mkfs_udf`"
+        export XFS_FSR_PROG="`set_prog_path /usr/etc/fsr_xfs`"
+        export MKFS_NFS_PROG="false"
+        ;;
     Linux)
-          export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
-          export MKFS_UDF_PROG="`set_prog_path mkudffs`"
-          export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
-          export MKFS_NFS_PROG="false"
-          ;;
+        export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
+        export MKFS_UDF_PROG="`set_prog_path mkudffs`"
+        export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
+        export MKFS_NFS_PROG="false"
+        ;;
 esac
 
 known_hosts()
 {
-       case "$HOST"
-       in
-           sheila)
-               #dedicated qa machine (has some values already set)
-               [ -z "$MODULAR" ] && MODULAR=1
-               EMAIL="ddiss@sgi.com"
-               [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-               [ -z "$TEST_DEV" ] && TEST_DEV=/dev/hdb1
-               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/hdb3
-               [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-               [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/hdb2
-               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/hdb4
-               [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-               ;;
-            break)
-               MODULAR=1
-               EMAIL="nathans@larry"
-               SCRATCH_MNT=/mnt/scratch
-                #SCRATCH_DEV=/dev/sda6
-               SCRATCH_DEV=budgie:/mnt/scratch
-               TEST_DIR=/mnt/test
-                #TEST_DEV=/dev/sda5
-               TEST_DEV=budgie:/mnt/test
-               ;;
-           bruce)
-               MODULAR=0
-               EMAIL="nathans@larry"
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdb5
-               SCRATCH_RTDEV=/dev/sdc1
-               SCRATCH_LOGDEV=/dev/ram0
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sdc3
-               TEST_RTDEV=/dev/sdb6
-               TEST_LOGDEV=/dev/ram1
-               #TAPE_DEV=/dev/st0
-               #RMT_TAPE_DEV=bruce:/dev/st0
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_USER=guest
-               ;;
-           frodo)
-               MODULAR=0
-               EMAIL="nathans@larry"
-               TEST_DEV=/dev/hda6
-               TEST_DIR=/mnt/test
-               SCRATCH_DEV=/dev/hda7
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_LOGDEV=/dev/hda9
-               ;;
-           goldfish)
-               MODULAR=0
-               TEST_DEV=/dev/hdc1
-               TEST_DIR=/mnt/xfs0
-               SCRATCH_DEV=/dev/hdc2
-               SCRATCH_MNT=/mnt/xfs1
-               SCRATCH_LOGDEV=/dev/hdc3
-               ;;
-           burst)
-               TEST_DIR=/xfs
-               TEST_DEV=/dev/hda3
-               SCRATCH_DEV=/dev/hda7
-               SCRATCH_MNT=/scratch
-               ;;
-           lumpy)
-               TEST_DEV=/dev/sdc5
-               TEST_DIR=/mnt/scratch_0
-               SCRATCH_DEV=/dev/sdc7
-               SCRATCH_MNT=/mnt/scratch_2
-               ;;
-           bongo)
-               TEST_DEV=/dev/hda8
-               TEST_DIR=/xfs1
-               SCRATCH_DEV=/dev/hda9
-               SCRATCH_MNT=/xfs2
-               SCRATCH_LOGDEV=/dev/hda10
-               SCRATCH_RTDEV=/dev/hda11
-               ;;
-           surly)
-               TEST_DEV=/dev/hda9
-               TEST_DIR=/mnt/xfs1
-               SCRATCH_DEV=/dev/hda8
-               SCRATCH_MNT=/mnt/xfs0
-               SCRATCH_LOGDEV=/dev/hda10
-               TAPE_DEV=/dev/st0
-               RMT_TAPE_DEV=fuzzy:/dev/st0
-               RMT_IRIXTAPE_DEV=blub:/dev/tape
-               RMT_TAPE_USER=guest
-               ;;
-           permit)
-               TEST_DEV=/dev/sdc1
-               TEST_DIR=/mnt/xfs0
-               SCRATCH_DEV=/dev/sdd1
-               SCRATCH_MNT=/mnt/xfs1
-               ;;
-           indra)
-               TEST_DEV=/dev/sdb1
-               TEST_DIR=/mnt/xfs0
-               SCRATCH_DEV=/dev/sdb2
-               SCRATCH_MNT=/mnt/xfs1
-               ;;
-           usermode)
-               TEST_DEV=/dev/ubd/1
-               TEST_DIR=/mnt/test
-               SCRATCH_DEV=/dev/ubd/2
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_RTDEV=/dev/ubd/3
-               SCRATCH_LOGDEV=/dev/ubd/4
-               ;;
-           lite)
-               TEST_DEV=/dev/sda1
-               TEST_DIR=/mnt/sda1
-               SCRATCH_DEV=/dev/sda2
-               SCRATCH_MNT=/mnt/sda2
-               SCRATCH_LOGDEV=/dev/sda3
-               SCRATCH_RTDEV=/dev/sda4
-               ;;
-           dmfnt2)
-               TEST_DEV=/dev/sda6
-               TEST_DIR=/mnt/test
-               SCRATCH_DEV=/dev/sdc6
-               SCRATCH_MNT=/mnt/scratch
-               TAPE_DEV=/dev/st0
-               RMT_TAPE_DEV=longhorn:/dev/tape
-               # RMT_IRIXTAPE_DEV=longhorn:/dev/tape
-               RMT_TAPE_USER=guest
-               ;;
-           lab343)
-               MODULAR=0
-               EMAIL="hch@sgi.com"
-               TEST_DEV=/dev/sdb1
-               SCRATCH_DEV=/dev/sdb2
-               SCRATCH_LOGDEV=/dev/sdb5
-               SCRATCH_RTDEV=/dev/sdb6
-               TEST_DIR=/qa/test
-               SCRATCH_MNT=/qa/scratch
-               ;;
-            dribble)
-               #dedicated qa machine
-                MODULAR=0
-                EMAIL="ddiss@sgi.com"
-                TEST_DIR=/mnt/test
-                TEST_DEV=/dev/dsk/dks0d2s0
-                SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/dsk/dks0d2s6
-                #TAPE_DEV=/dev/tape
-                #RMT_TAPE_DEV=icy:/dev/st0
-                #RMT_TAPE_USER=guest
-                ;;
-             giro)
-                MODULAR=0
-                EMAIL="ddiss@sgi.com"
-                TEST_DIR=/mnt/test
-                TEST_DEV=/dev/dsk/dks0d2s0
-                SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/dsk/dks0d2s6
-                #TAPE_DEV=/dev/tape
-                #RMT_TAPE_DEV=icy:/dev/st0
-                #RMT_TAPE_USER=guest
-                ;;
-            cxfsirix1)
-                EMAIL="ajones@sgi.com"
-                TEST_DIR=/mnt/xfs_test0
-                TEST_DEV=/dev/cxvm/xfs_test0
-                SCRATCH_MNT=/mnt/xfs_test1
-               SCRATCH_DEV=/dev/cxvm/xfs_test1
-                ;;
-            hammer)
-                EMAIL="bnaujok@sgi.com"
-                TEST_DIR=/mnt/test
-                TEST_DEV=/dev/sda5
-                SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sda6
-                ;;
-           emu)
-               MODULAR=0
-               EMAIL="vapo@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sdb1
-               SCRATCH_MNT=/mnt/scratch1
-               SCRATCH_DEV=/dev/sdb2
-               ;;
-            scaly)
-                EMAIL="bnaujok@sgi.com"
-                TEST_DIR=/mnt/test
-                TEST_DEV=/dev/sdd3
-               #TEST_LOGDEV=/dev/sdd1
-                SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdd4
-               #SCRATCH_LOGDEV=/dev/sdd2
-                ;;
-            cxfsaltix5)                                                                           
-                EMAIL="leenap@sgi.com"                        
-               TEST_DIR=/mnt/xfsnew
-                TEST_DEV=/dev/lxvm/xfsnew                
-                SCRATCH_MNT=/mnt/xfsscratch
-                SCRATCH_DEV=/dev/lxvm/xfsscratch
-                ;;
-            kermit1)
-                EMAIL="mohamedb@sgi.com"
-                #EMAIL="leenap@sgi.com"
-                #TEST_DIR=/mnt/xfs_test
-                #TEST_DEV=/dev/lxvm/xfs_test
-                #TEST_DIR=/mnt/xfsdata
-                #TEST_DEV=/dev/cxvm/xfsdata
-                #TEST_LOGDEV=/dev/sdd1
-                #SCRATCH_MNT=/mnt/xfs_scratch
-                #SCRATCH_DEV=/dev/lxvm/xfs_scratch
-                #SCRATCH_MNT=/mnt/xfsscratch
-                #SCRATCH_DEV=/dev/cxvm/xfsscratch
-                #SCRATCH_LOGDEV=/dev/sdd2
-                TEST_DIR=/mnt/xfs_test
-               TEST_DEV=/dev/lxvm/xfs_test
-               SCRATCH_MNT=/mnt/xfs_scratch
-               SCRATCH_DEV=/dev/lxvm/xfs_scratch
-               ;;
-            rizzo1)
-                EMAIL="mohamedb@sgi.com"
-                TEST_DIR=/mnt/xfs_test
-               TEST_DEV=/dev/lxvm/xfs_test
-               SCRATCH_MNT=/mnt/xfs_scratch
-               SCRATCH_DEV=/dev/lxvm/xfs_scratch
-               ;;
-           gaspode)
-               #dedicated qa machine (has some values already set)
-               [ -z "$MODULAR" ] && MODULAR=1
-               EMAIL="ddiss@sgi.com"
-               [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-               [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-               [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-               [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-               [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-               [ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
-               ;;
-           hellfire)
-               MODULAR=1
-               EMAIL="ajones@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sda3
-               TEST_LOGDEV=/dev/sda5
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sda4
-               SCRATCH_LOGDEV=/dev/sda6
-               #SCRATCH_RTDEV=/dev/sda7
-               TAPE_DEV=/dev/st0
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_DEV=icy:/dev/st0
-               #RMT_TAPE_USER=guest
-               ;;
-           rooster)
-               MODULAR=1
-               EMAIL="ajones@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sdb1
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdb2
-               TAPE_DEV=/dev/st0
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_DEV=icy:/dev/st0
-               #RMT_TAPE_USER=guest
-               ;;
-           rosella)
-               MODULAR=1
-               EMAIL="ajones@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sdb1
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdb3
-               TAPE_DEV=/dev/st0
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_DEV=icy:/dev/st0
-               #RMT_TAPE_USER=guest
-               ;;
-           crackle)
-               #irix-crackle
-               TEST_DIR=/mnt/xfs
-               SCRATCH_MNT=/mnt/xfs2
-               TEST_DEV=/dev/dsk/dks0d1s3
-               SCRATCH_DEV=/dev/dsk/dks0d1s4
-               ;;
-           tinkle)
-               #irix-patchbox-tinkle
-               TEST_DEV=/dev/dsk/dks0d2s0
-               TEST_DIR=/mnt/xfs_test
-               SCRATCH_DEV=/dev/dsk/dks0d2s1
-               SCRATCH_MNT=/mnt/xfs_scratch
-               ;;
-           cocky)
-               MODULAR=1
-               EMAIL="ajones@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sdb1
-               TEST_LOGDEV=/dev/sdb3
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdb2
-               SCRATCH_LOGDEV=/dev/sdb4
-               #SCRATCH_RTDEV=/dev/sdb5
-               TAPE_DEV=/dev/st0
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_DEV=icy:/dev/st0
-               #RMT_TAPE_USER=guest
-               ;;
-           porky)
-               #dedicated qa machine (has some values already set)
-               [ -z "$MODULAR" ] && MODULAR=1
-               EMAIL="ajones@sgi.com"
-               [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-               [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-               [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-               [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-               [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-               [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-               #[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb7
-               #[ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
-               ;;
-           puffy)
-               MODULAR=1
-               EMAIL="tes@sgi.com"
-               TEST_DIR=/mnt/test
-               TEST_DEV=/dev/sda7
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sda8
-               TAPE_DEV=/dev/st0
-               ;;
-           galah)
-               MODULAR=1
-               EMAIL="ddiss@sgi.com"
-               TEST_DIR=/mnt/data
-               TEST_DEV=/dev/sdb1
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sda6
-               #RMT_IRIXTAPE_DEV=snort:/dev/tape
-               #RMT_TAPE_DEV=icy:/dev/st0
-               #RMT_TAPE_USER=guest
-               ;;
+    case "$HOST" in
+        vimes)
+            # dedicated qa machine, used to be sheila
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/hdb1
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/hdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/hdb2
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/hdb4
+            [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
+            ;;
+        break)
+            MODULAR=1
+            EMAIL="nathans@larry"
+            SCRATCH_MNT=/mnt/scratch
+            #SCRATCH_DEV=/dev/sda6
+            SCRATCH_DEV=budgie:/mnt/scratch
+            TEST_DIR=/mnt/test
+            #TEST_DEV=/dev/sda5
+            TEST_DEV=budgie:/mnt/test
+            ;;
+        bruce)
+            MODULAR=0
+            EMAIL="nathans@larry"
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdb5
+            SCRATCH_RTDEV=/dev/sdc1
+            SCRATCH_LOGDEV=/dev/ram0
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdc3
+            TEST_RTDEV=/dev/sdb6
+            TEST_LOGDEV=/dev/ram1
+            #TAPE_DEV=/dev/st0
+            #RMT_TAPE_DEV=bruce:/dev/st0
+            #RMT_IRIXTAPE_DEV=snort:/dev/tape
+            #RMT_TAPE_USER=guest
+            ;;
+        frodo)
+            MODULAR=0
+            EMAIL="nathans@larry"
+            TEST_DEV=/dev/hda6
+            TEST_DIR=/mnt/test
+            SCRATCH_DEV=/dev/hda7
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_LOGDEV=/dev/hda9
+            ;;
+        goldfish)
+            MODULAR=0
+            TEST_DEV=/dev/hdc1
+            TEST_DIR=/mnt/xfs0
+            SCRATCH_DEV=/dev/hdc2
+            SCRATCH_MNT=/mnt/xfs1
+            SCRATCH_LOGDEV=/dev/hdc3
+            ;;
+        burst)
+            TEST_DIR=/xfs
+            TEST_DEV=/dev/hda3
+            SCRATCH_DEV=/dev/hda7
+            SCRATCH_MNT=/scratch
+            ;;
+        lumpy)
+            TEST_DEV=/dev/sdc5
+            TEST_DIR=/mnt/scratch_0
+            SCRATCH_DEV=/dev/sdc7
+            SCRATCH_MNT=/mnt/scratch_2
+            ;;
+        bongo)
+            TEST_DEV=/dev/hda8
+            TEST_DIR=/xfs1
+            SCRATCH_DEV=/dev/hda9
+            SCRATCH_MNT=/xfs2
+            SCRATCH_LOGDEV=/dev/hda10
+            SCRATCH_RTDEV=/dev/hda11
+            ;;
+        surly)
+            TEST_DEV=/dev/hda9
+            TEST_DIR=/mnt/xfs1
+            SCRATCH_DEV=/dev/hda8
+            SCRATCH_MNT=/mnt/xfs0
+            SCRATCH_LOGDEV=/dev/hda10
+            TAPE_DEV=/dev/st0
+            RMT_TAPE_DEV=fuzzy:/dev/st0
+            RMT_IRIXTAPE_DEV=blub:/dev/tape
+            RMT_TAPE_USER=guest
+            ;;
+        permit)
+            TEST_DEV=/dev/sdc1
+            TEST_DIR=/mnt/xfs0
+            SCRATCH_DEV=/dev/sdd1
+            SCRATCH_MNT=/mnt/xfs1
+            ;;
+        indra)
+            TEST_DEV=/dev/sdb1
+            TEST_DIR=/mnt/xfs0
+            SCRATCH_DEV=/dev/sdb2
+            SCRATCH_MNT=/mnt/xfs1
+            ;;
+        usermode)
+            TEST_DEV=/dev/ubd/1
+            TEST_DIR=/mnt/test
+            SCRATCH_DEV=/dev/ubd/2
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_RTDEV=/dev/ubd/3
+            SCRATCH_LOGDEV=/dev/ubd/4
+            ;;
+        lite)
+            TEST_DEV=/dev/sda1
+            TEST_DIR=/mnt/sda1
+            SCRATCH_DEV=/dev/sda2
+            SCRATCH_MNT=/mnt/sda2
+            SCRATCH_LOGDEV=/dev/sda3
+            SCRATCH_RTDEV=/dev/sda4
+            ;;
+        dmfnt2)
+            TEST_DEV=/dev/sda6
+            TEST_DIR=/mnt/test
+            SCRATCH_DEV=/dev/sdc6
+            SCRATCH_MNT=/mnt/scratch
+            TAPE_DEV=/dev/st0
+            RMT_TAPE_DEV=longhorn:/dev/tape
+            # RMT_IRIXTAPE_DEV=longhorn:/dev/tape
+            RMT_TAPE_USER=guest
+            ;;
+        lab343)
+            MODULAR=0
+            EMAIL="hch@sgi.com"
+            TEST_DEV=/dev/sdb1
+            SCRATCH_DEV=/dev/sdb2
+            SCRATCH_LOGDEV=/dev/sdb5
+            SCRATCH_RTDEV=/dev/sdb6
+            TEST_DIR=/qa/test
+            SCRATCH_MNT=/qa/scratch
+            ;;
+        dribble)
+            #dedicated qa machine
+            MODULAR=0
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/dsk/dks0d2s0
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/dsk/dks0d2s6
+            #TAPE_DEV=/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        carrot)
+            #dedicated qa machine, used to be dribble
+            MODULAR=0
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/dsk/dks0d2s0
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/dsk/dks0d2s6
+            #TAPE_DEV=/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        giro)
+            MODULAR=0
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/dsk/dks0d2s0
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/dsk/dks0d2s6
+            #TAPE_DEV=/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        cxfsirix1)
+            EMAIL="ajones@sgi.com"
+            TEST_DIR=/mnt/xfs_test0
+            TEST_DEV=/dev/cxvm/xfs_test0
+            SCRATCH_MNT=/mnt/xfs_test1
+            SCRATCH_DEV=/dev/cxvm/xfs_test1
+            ;;
+        hammer)
+            EMAIL="bnaujok@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sda5
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sda6
+            ;;
+        emu)
+            MODULAR=0
+            EMAIL="vapo@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdb1
+            SCRATCH_MNT=/mnt/scratch1
+            SCRATCH_DEV=/dev/sdb2
+            ;;
+        scaly)
+            EMAIL="bnaujok@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdd3
+            #TEST_LOGDEV=/dev/sdd1
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdd4
+            #SCRATCH_LOGDEV=/dev/sdd2
+            ;;
+        cxfsaltix5)
+            EMAIL="leenap@sgi.com"
+            TEST_DIR=/mnt/xfsnew
+            TEST_DEV=/dev/lxvm/xfsnew
+            SCRATCH_MNT=/mnt/xfsscratch
+            SCRATCH_DEV=/dev/lxvm/xfsscratch
+            ;;
+        kermit1)
+            EMAIL="mohamedb@sgi.com"
+            #EMAIL="leenap@sgi.com"
+            #TEST_DIR=/mnt/xfs_test
+            #TEST_DEV=/dev/lxvm/xfs_test
+            #TEST_DIR=/mnt/xfsdata
+            #TEST_DEV=/dev/cxvm/xfsdata
+            #TEST_LOGDEV=/dev/sdd1
+            #SCRATCH_MNT=/mnt/xfs_scratch
+            #SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            #SCRATCH_MNT=/mnt/xfsscratch
+            #SCRATCH_DEV=/dev/cxvm/xfsscratch
+            #SCRATCH_LOGDEV=/dev/sdd2
+            TEST_DIR=/mnt/xfs_test
+            TEST_DEV=/dev/lxvm/xfs_test
+            SCRATCH_MNT=/mnt/xfs_scratch
+            SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            ;;
+        rizzo1)
+            EMAIL="mohamedb@sgi.com"
+            TEST_DIR=/mnt/xfs_test
+            TEST_DEV=/dev/lxvm/xfs_test
+            SCRATCH_MNT=/mnt/xfs_scratch
+            SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            ;;
+        gaspode)
+            #dedicated qa machine (has some values already set)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+            [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
+            [ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
+            ;;
+        hellfire)
+            MODULAR=1
+            EMAIL="ajones@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sda3
+            TEST_LOGDEV=/dev/sda5
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sda4
+            SCRATCH_LOGDEV=/dev/sda6
+            #SCRATCH_RTDEV=/dev/sda7
+            TAPE_DEV=/dev/st0
+            #RMT_IRIXTAPE_DEV=snort:/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        rooster)
+            MODULAR=1
+            EMAIL="ajones@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdb1
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdb2
+            TAPE_DEV=/dev/st0
+            #RMT_IRIXTAPE_DEV=snort:/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        rosella)
+            MODULAR=1
+            EMAIL="ajones@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdb1
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdb3
+            TAPE_DEV=/dev/st0
+            #RMT_IRIXTAPE_DEV=snort:/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        crackle)
+            #irix-crackle
+            TEST_DIR=/mnt/xfs
+            SCRATCH_MNT=/mnt/xfs2
+            TEST_DEV=/dev/dsk/dks0d1s3
+            SCRATCH_DEV=/dev/dsk/dks0d1s4
+            ;;
+        tinkle)
+            #irix-patchbox-tinkle
+            TEST_DEV=/dev/dsk/dks0d2s0
+            TEST_DIR=/mnt/xfs_test
+            SCRATCH_DEV=/dev/dsk/dks0d2s1
+            SCRATCH_MNT=/mnt/xfs_scratch
+            ;;
+        cocky)
+            MODULAR=1
+            EMAIL="ajones@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sdb1
+            TEST_LOGDEV=/dev/sdb3
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdb2
+            SCRATCH_LOGDEV=/dev/sdb4
+            #SCRATCH_RTDEV=/dev/sdb5
+            TAPE_DEV=/dev/st0
+            #RMT_IRIXTAPE_DEV=snort:/dev/tape
+            #RMT_TAPE_DEV=icy:/dev/st0
+            #RMT_TAPE_USER=guest
+            ;;
+        nobbs)
+            #dedicated qa machine, used to be porky
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+            #[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb7
+            #[ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
+            ;;
+        puffy)
+            MODULAR=1
+            EMAIL="tes@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/sda7
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sda8
+            TAPE_DEV=/dev/st0
+            ;;
+        galah)
+            MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/data
+            TEST_DEV=/dev/sdb1
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sda6
+            ;;
         screamer)
-               #dedicated qa machine (has some values already set)
-                [ -z "$MODULAR" ] && MODULAR=1
-                EMAIL="ddiss@sgi.com"
-                [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-                [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-                #[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-                [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-                [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-                #[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-                #[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-                ;;
-            linux-chatz)
-               #vmware on pc-chatz
-               MODULAR=1
-               EMAIL="chatz@sgi.com"
-               USE_EXTERNAL=yes
-               TEST_DIR="/mnt/data"
-               TEST_DEV=/dev/sdd
-               TEST_LOGDEV=/dev/sdb
-               SCRATCH_MNT=/mnt/scratch
-               SCRATCH_DEV=/dev/sdg
-               SCRATCH_LOGDEV=/mnt/sde
-               ;;
-               chapter11)
-                       [ -z "$MODULAR" ] && MODULAR=1
-                       EMAIL="ddiss@sgi.com"
-                       [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-                       [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
-                       [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb7
-                       [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-                       [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
-                       [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb8
-                       [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb9
-                       ;;
-               dassi)
-                       MODULAR=0
-                       EMAIL="ddiss@sgi.com"
-                       TEST_DIR=/mnt/test
-                       TEST_DEV=/dev/dsk/dks0d2s0
-                       SCRATCH_MNT=/mnt/scratch
-                       SCRATCH_DEV=/dev/dsk/dks0d2s6
-                       ;;
-               molten)
-                       [ -z "$MODULAR" ] && MODULAR=1
-                       EMAIL="ddiss@sgi.com"
-                       [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-                       [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
-                       [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-                       [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
-                       ;;
-               howler)
-                       [ -z "$MODULAR" ] && MODULAR=1
-                       EMAIL="allanr@sgi.com"
-                       [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-                       [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-                       [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-                       [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-                       ;;
-               flame)
-                       #dedicated qa machine (has some values already set)
-                       [ -z "$MODULAR" ] && MODULAR=1
-                       EMAIL="ddiss@sgi.com"
-                       [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
-                       [ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
-                       [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
-                       [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
-                       ;;
-               *)
-                       echo "Error: need to define parameters for host $HOST"
-                       exit 1
-                       ;;
-       esac
+            #dedicated qa machine (has some values already set)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            #[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            #[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+            #[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
+            ;;
+        linux-chatz)
+            #vmware on pc-chatz
+            MODULAR=1
+            EMAIL="chatz@sgi.com"
+            USE_EXTERNAL=yes
+            TEST_DIR="/mnt/data"
+            TEST_DEV=/dev/sdd
+            TEST_LOGDEV=/dev/sdb
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/sdg
+            SCRATCH_LOGDEV=/mnt/sde
+            ;;
+        chapter11)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb7
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb8
+            [ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb9
+            ;;
+        dassi)
+            MODULAR=0
+            EMAIL="ddiss@sgi.com"
+            TEST_DIR=/mnt/test
+            TEST_DEV=/dev/dsk/dks0d2s0
+            SCRATCH_MNT=/mnt/scratch
+            SCRATCH_DEV=/dev/dsk/dks0d2s6
+            ;;
+        molten)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
+            ;;
+        howler)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="allanr@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            ;;
+        flame)
+            #dedicated qa machine (has some values already set)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
+            ;;
+        growler)
+            [ -z "$MODULAR" ] && MODULAR=1
+            EMAIL="ddiss@sgi.com"
+            [ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
+            [ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
+            [ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
+            [ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
+            [ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
+            [ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
+            ;;
+        *)
+            echo "Error: need to define parameters for host $HOST"
+            exit 1
+            ;;
+    esac
 }
 
 if [ -f "$HOST_OPTIONS" ]; then
@@ -565,48 +580,43 @@ else
 fi
 
 echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
-if [ ! -b "$TEST_DEV" -a "$?" != "0" ]
-then
+if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
     echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
-if [ ! -d "$TEST_DIR" ]
-then
+if [ ! -d "$TEST_DIR" ]; then
     echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
     exit 1
 fi
 
 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
-if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
-then
+if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]; then
     echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
     exit 1
 fi
 
-if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]
-then
+if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]; then
     echo "common.config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
     exit 1
 fi
 
 _readlink()
 {
-    if [ $# -ne 1 ]
-    then
-       echo "Usage: _readlink filename" 1>&2
-       exit 1
+    if [ $# -ne 1 ]; then
+        echo "Usage: _readlink filename" 1>&2
+        exit 1
     fi
-
+    
     perl -e "\$in=\"$1\";" -e '
-       $lnk = readlink($in);
-       if ($lnk =~ m!^/.*!) {
-         print "$lnk\n";
-       }
-       else {
-         chomp($dir = `dirname $in`);
-         print "$dir/$lnk\n";
-       }'
+    $lnk = readlink($in);
+    if ($lnk =~ m!^/.*!) {
+        print "$lnk\n";
+    }
+    else {
+        chomp($dir = `dirname $in`);
+        print "$dir/$lnk\n";
+    }'
 }
 
 # if devfs is running expand the full /dev/.. pathname - this is what will be