diff options
author | Renato Botelho <renato@netgate.com> | 2015-10-23 15:21:12 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-10-23 15:22:02 -0200 |
commit | 54d0cd74ea3690a8e589dfde15602a9a0ce492a9 (patch) | |
tree | 26f505f4b2bd630979089b394c6582687b549239 /src | |
parent | 3beae1fb0a0ce23a9fd63503de4d794651877b02 (diff) | |
download | pfsense-54d0cd74ea3690a8e589dfde15602a9a0ce492a9.zip pfsense-54d0cd74ea3690a8e589dfde15602a9a0ce492a9.tar.gz |
Fix #5338: Add -4 and -6 options to pfSense-upgrade to select IP protocol version
Diffstat (limited to 'src')
-rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 6b14735..5244292 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -47,7 +47,9 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. usage() { - echo "Usage: $(basename ${0}) [-bdyf] [-u|-i PKG_NAME|-r PKG_NAME]" >&2 + echo "Usage: $(basename ${0}) [-46bdyf] [-u|-i PKG_NAME|-r PKG_NAME]" >&2 + echo " -4 - Force IPv4" + echo " -6 - Force IPv6" echo " -b - Platform is booting" >&2 echo " -d - Turn on debug" >&2 echo " -f - Force package installation" >&2 @@ -593,8 +595,24 @@ unset progress_file unset progress_socket unset action unset action_pkg -while getopts b:dfi:hp:l:r:uy opt; do +unset force_ipv4 +unset force_ipv6 +while getopts 46b:dfi:hp:l:r:uy opt; do case ${opt} in + 4) + if [ -n "${force_ipv6}" ]; then + usage + _exit 1 + fi + force_ipv4=1 + ;; + 6) + if [ -n "${force_ipv4}" ]; then + usage + _exit 1 + fi + force_ipv6=1 + ;; b) booting=1 boot_stage="${OPTARG}" @@ -656,6 +674,12 @@ while getopts b:dfi:hp:l:r:uy opt; do esac done +if [ -n "${force_ipv4}" ]; then + export IP_VERSION="4" +elif [ -n "${force_ipv6}" ]; then + export IP_VERSION="6" +fi + # Set default action when no parameter is set : ${action:="upgrade"} |