setup: add section support

Make the setup command section aware so that it is easy to test
whether the section config code is generating the correct
configurations or not.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/check b/check
index 135a9fbd2718fb682cc2a5973055d0904c81f803..fa9697f459285556183ff2ca45395c6ebbc4d1f3 100755 (executable)
--- a/check
+++ b/check
@@ -421,6 +421,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
                for s in $RUN_SECTION; do
                        if [ $section == $s ]; then
                                skip=false
                for s in $RUN_SECTION; do
                        if [ $section == $s ]; then
                                skip=false

+                               break;

                        fi
                done
                if $skip; then
                        fi
                done
                if $skip; then

diff --git a/setup b/setup
index eb7bdb336952a28bedff45a5866bcdf7445815d5..8675b5304b1dcdb2ac2281af56b09e047f2fb501 100755 (executable)
--- a/setup
+++ b/setup
@@ -15,22 +15,64 @@
 # along with this program; if not, write the Free Software Foundation,
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # along with this program; if not, write the Free Software Foundation,
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

+usage()
+{
+
+       echo "Usage: $0 [options]"'
+
+       -s section              run only specified section(s) from config file
+'
+       exit 0
+}
+
+while [ $# -gt 0 ]; do
+       case "$1" in
+       -\? | -h | --help) usage ;;
+       -s)     RUN_SECTION="$RUN_SECTION $2"; shift ;;
+       *)      usage ;;
+       esac
+       shift
+done
+

 if ! . ./common/config
 then
     echo "check: failed to source common/config"
     exit 1
 fi
 
 if ! . ./common/config
 then
     echo "check: failed to source common/config"
     exit 1
 fi
 

-[ "$USE_EXTERNAL"    = yes ] || USE_EXTERNAL=no
-[ "$USE_LBD_PATCH"   = yes ] || USE_LBD_PATCH=no
-[ "$LARGE_SCRATCH_DEV"  = yes ] || LARGE_SCRATCH_DEV=no
-[ "$USE_ATTR_SECURE" = yes ] || USE_ATTR_SECURE=no
-[ -z "$FSTYP" ] && FSTYP="xfs"
+for section in $HOST_OPTIONS_SECTIONS; do
+       OLD_FSTYP=$FSTYP
+       OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS
+       get_next_config $section
+
+       # Do we need to run only some sections ?
+       if [ ! -z "$RUN_SECTION" ]; then
+               skip=true
+               for s in $RUN_SECTION; do
+                       if [ $section == $s ]; then
+                               skip=false
+                               break;
+                       fi
+               done
+               if $skip; then
+                       continue
+               fi
+       fi
+
+       [ "$USE_EXTERNAL"    = yes ] || USE_EXTERNAL=no
+       [ "$USE_LBD_PATCH"   = yes ] || USE_LBD_PATCH=no
+       [ "$LARGE_SCRATCH_DEV"  = yes ] || LARGE_SCRATCH_DEV=no
+       [ "$USE_ATTR_SECURE" = yes ] || USE_ATTR_SECURE=no
+       [ -z "$FSTYP" ] && FSTYP="xfs"
+
+       cat <<EOF
+SECTION       -- $section

 
 

-cat <<EOF

 TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
 TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
 SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]
 VARIABLES: external=$USE_EXTERNAL largeblk=$USE_LBD_PATCH fstyp=$FSTYP
           large_scratch_dev=$LARGE_SCRATCH_DEV attrsecure=$USE_ATTR_SECURE
 TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
 TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
 SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]
 VARIABLES: external=$USE_EXTERNAL largeblk=$USE_LBD_PATCH fstyp=$FSTYP
           large_scratch_dev=$LARGE_SCRATCH_DEV attrsecure=$USE_ATTR_SECURE

+--------

 EOF
 EOF

+done