Changeset de63126 for common

Timestamp:

03/12/2010 03:32:25 AM (14 years ago)

Author:

Thomas Pegg <thomasp@…>

Branches:

2.3, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

9d55d85

Parents:

0873ccc

Message:

Add configuration options for retry on connection refused, number of times to attemp to download a file, and timeout for wget invocation. Thanks to Tim Sarbin for the patch, slightly modified by me to accomodate a second set of wget calls.

Location:

common/libs

Files:

• func_download_pkgs (modified) (3 diffs)
• func_validate_configs.sh (modified) (2 diffs)

common/libs/func_download_pkgs

@@ -8 +8 @@
 #----------------------------#
   local saveIFS=$IFS
-  local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE
+  local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE WGETPARAM
+
+  WGETPARAM=""
+  if [[ "${RETRYSRCDOWNLOAD}" = "y" ]] ; then
+    WGETPARAM+="--retry-connrefused"
+  fi
+  WGETPARAM+=" --tries ${RETRYDOWNLOADCNT}"
+  WGETPARAM+=" --timeout ${DOWNLOADTIMEOUT}"
 
     # Test if the packages must be downloaded
@@ -69 +76 @@
       # If the file does not exist yet in /sources download a fresh one
       if [ ! -f $FILE ] ; then
-        if ! wget $URL1 && ! wget $URL2 ; then
+        if ! wget $URL1 $WGETPARAM && ! wget $URL2 $WGETPARAM ; then
           gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING"
           continue
@@ -89 +96 @@
       fromARCHIVE=0;
         # Try to retrieve again the file. Servers in reverse order.
-      if ! wget $URL2 && ! wget $URL1 ; then
+      if ! wget $URL2 $WGETPARAM && ! wget $URL1 $WGETPARAM ; then
         gs_wrt_message "$FILE not found on the servers.. SKIPPING"
         continue

common/libs/func_validate_configs.sh

@@ -24 +24 @@
   local -r      BOOK_clfsX="ARCH TARGET"
   local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
-                            SERVER GETKERNEL RUNMAKE"
+                            SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
+                            GETKERNEL RUNMAKE"
   local -r    BUILD_chroot="TEST BOMB_TEST STRIP"
   local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
@@ -136 +137 @@
                     [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`"
                   fi ;;
-      COMPARE)    [[ ! "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      RUN_ICA)    [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      RUN_FARCE)  [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      ITERATIONS) [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      BOMB_TEST)  [[ ! "$TEST" = "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      TARGET32)   [[ -n "${TARGET32}" ]] &&  echo -e "`eval echo $PARAM_VALS`" ;;
-      MIPS_LEVEL) [[ "${ARCH}" = "mips" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      SERVER)     [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      COMPARE)          [[ ! "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      RUN_ICA)          [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      RUN_FARCE)        [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      ITERATIONS)       [[ "$COMPARE" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      BOMB_TEST)        [[ ! "$TEST" = "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      TARGET32)         [[ -n "${TARGET32}" ]] &&  echo -e "`eval echo $PARAM_VALS`" ;;
+      MIPS_LEVEL)       [[ "${ARCH}" = "mips" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      SERVER)           [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      RETRYSRCDOWNLOAD) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      DOWNLOADTIMEOUT)  [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
 
       # Envars that requires some validation