Eliminate redundant checks of cifs_version.

windows_archive/configure-archive.sh

@@ -1,7 +1,5 @@
 #!/bin/bash -eu
 
-cifs_version="${cifs_version:-3}"
-
 function configure_archive () {
   local archive_server_ip_address="$1"
 

windows_archive/setup-teslausb

@@ -178,11 +178,6 @@ function make_root_fs_readonly () {
 
 echo "Verifying environment variables..."
 
-if [ ! -n "${cifs_version+x}" ]
-then
-  cifs_version=3
-fi
-
 if [ $RSYNC_ENABLE = true ]
 then
   check_variable "RSYNC_USER"
@@ -193,7 +188,10 @@ else # Else for now, TODO allow both for more redundancy?
   check_variable "sharename"
   check_variable "shareuser"
   check_variable "sharepassword"
+  
+  export cifs_version="${cifs_version:-3}"
 fi
+
 check_variable "archiveserver"
 check_variable "campercent"
 

windows_archive/verify-archive-configuration.sh

@@ -1,7 +1,5 @@
 #!/bin/bash -eu
 
-cifs_version="${cifs_version:-3}"
-
 function check_archive_server_reachable () {
   echo "Verifying that the archive server $archiveserver is reachable..."
   local serverunreachable=false