From 9dd3b135c5e709197671a5db09c2b76c09217483 Mon Sep 17 00:00:00 2001 From: Ray Tanaka Date: Tue, 30 Oct 2018 23:11:41 -0700 Subject: [PATCH] - removing echo - using new ip lookup function --- run/cifs_archive/configure-archive.sh | 2 +- run/cifs_archive/verify-archive-configuration.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/run/cifs_archive/configure-archive.sh b/run/cifs_archive/configure-archive.sh index a3e4ebd..f4204a9 100644 --- a/run/cifs_archive/configure-archive.sh +++ b/run/cifs_archive/configure-archive.sh @@ -23,6 +23,6 @@ function configure_archive () { echo "Configured the archive." } -ARCHIVE_SERVER_IP_ADDRESS="$( /root/bin/get-archiveserver-ip-address.sh )" +ARCHIVE_SERVER_IP_ADDRESS="$( $INSTALL_DIR/lookup-ip-address.sh "$archiveserver" )" configure_archive "$ARCHIVE_SERVER_IP_ADDRESS" \ No newline at end of file diff --git a/run/cifs_archive/verify-archive-configuration.sh b/run/cifs_archive/verify-archive-configuration.sh index 6968f02..6b6a7a1 100644 --- a/run/cifs_archive/verify-archive-configuration.sh +++ b/run/cifs_archive/verify-archive-configuration.sh @@ -31,7 +31,6 @@ function check_archive_mountable () { echo "password=$sharepassword" >> "$tmp_credentials_file_path" local mount_failed=false - echo "//$archive_server_ip_address/$sharename" "$test_mount_location" -o "vers=${cifs_version},credentials=${tmp_credentials_file_path},iocharset=utf8,file_mode=0777,dir_mode=0777" mount -t cifs "//$archive_server_ip_address/$sharename" "$test_mount_location" -o "vers=${cifs_version},credentials=${tmp_credentials_file_path},iocharset=utf8,file_mode=0777,dir_mode=0777" || mount_failed=true if [ "$mount_failed" = true ]