]> xenbits.xensource.com Git - xenclient/build.git/commitdiff
[host installer] allow URLs to specify port
authorChristopher Clark <christopher.clark@citrix.com>
Wed, 9 Sep 2009 16:51:36 +0000 (09:51 -0700)
committerChristopher Clark <christopher.clark@citrix.com>
Wed, 9 Sep 2009 16:51:36 +0000 (09:51 -0700)
target/generic/target_xenclient_installer_skeleton/install/stages/Configure-network-repo

index 406367a79f6c51dca3709c2bfdb671b52bc01453..181514e7d43af3fc20fee56ab148b7169bc7beb0 100755 (executable)
@@ -15,10 +15,10 @@ validate_repo_address()
     ADDR="$2"
     case "${PROTO}" in
         http)
-            TEST="$(echo ${ADDR} | sed -ne '/^http:\/\/[^:]*$/p')"
+            TEST="$(echo ${ADDR} | sed -ne '/^http:\/\/.*$/p')"
         ;;
         ftp)
-            TEST="$(echo ${ADDR} | sed -ne '/^ftp:\/\/[^:]*$/p')"
+            TEST="$(echo ${ADDR} | sed -ne '/^ftp:\/\/.*$/p')"
         ;;
         nfs)
             # Ensure that there is no "http", "ftp" or "nfs" prefix.
@@ -47,6 +47,7 @@ select_repo_type()
     if [ "${OPT}" != 0 ] ; then
         rm -f ${CAPTURE}
         [ "${OPT}" != 1 ]   || exit ${Previous}
+        [ "${OPT}" != 123 ] || exit ${Previous}
         [ "${OPT}" != 255 ] || exit ${Previous}
         exit ${Abort}
     fi