diff options
| author | Christian Rößler | 2015-11-12 17:15:18 +0100 |
|---|---|---|
| committer | Christian Rößler | 2015-11-12 17:15:18 +0100 |
| commit | 972dff34216afec2d80298a16147f61fc2fd6bd9 (patch) | |
| tree | 921490b4f30539dc633e6d712571c98539d5db89 /satellit_installer/satellit_installer | |
| parent | [SSPS] Some cosmetics in option help (diff) | |
| parent | [SSPS] option flag reverted (diff) | |
| download | setup-scripts-972dff34216afec2d80298a16147f61fc2fd6bd9.tar.gz setup-scripts-972dff34216afec2d80298a16147f61fc2fd6bd9.tar.xz setup-scripts-972dff34216afec2d80298a16147f61fc2fd6bd9.zip | |
Merge branch 'master' of git.openslx.org:bwlp/setup-scripts
Diffstat (limited to 'satellit_installer/satellit_installer')
| -rwxr-xr-x | satellit_installer/satellit_installer | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer index 8412749..e68ff8c 100755 --- a/satellit_installer/satellit_installer +++ b/satellit_installer/satellit_installer @@ -44,7 +44,7 @@ while [ -n "$1" ]; do export VERSION="$1" shift ;; - "-d" | "--delete") + "-n" | "--nodelete") NODELETE_SOURCE="true" shift ;; @@ -57,7 +57,7 @@ done # Some version string sanity checks: [ -z "$VERSION" ] && { echo "No version string has been given - exit."; exit 1; } -[ ${VERSION:0:1} = "-" ] && { echo "Possibly no version string has been given - exit."; exit 1; } +[ "${VERSION:0:1}" = '-' ] && { echo "Possibly no version string has been given - exit."; exit 1; } # Set and save some environmental variables: OLDUMASK=$(umask) @@ -82,9 +82,9 @@ echo " ok" ####### Main program ####### system_upgrade # No harm done even if not necessary - + install_packages "$PACKAGELIST_SCRIPT" # Packages needed for script - + # Then, let's download the needed helper files to static_files, as there # is no sense in commencing if one of these files is missing. get_files_http @@ -170,30 +170,23 @@ drop_firstrun_script install_slxlog install_finalize # Script for cleaning some stuff after installation +# +# set_directory_permissions +# +# # Remove translation from menu etc. +# patch_slxadmin +# +# tar -z -c -T /dev/null -f /opt/openslx/empty.tgz +# +# # Mark vmstore as not mounted +# touch "/srv/openslx/nfs/.notmounted" -set_directory_permissions - -# Remove translation from menu etc. -patch_slxadmin - -tar -z -c -T /dev/null -f /opt/openslx/empty.tgz - -# Mark vmstore as not mounted -touch "/srv/openslx/nfs/.notmounted" - -# Activate 'purge_install' here - but be careful! This is for debugging purposes only! -# purge_install - -# cleaning log files, authorized hosts +# cleaning log files, authorized hosts, sources clean_install end_message finalize # Cleaning script; finalize script will delete itself. -# cleaning log files, authorized hosts, sources -clean_install -end_message - -[ NODELETE_SOURCE = "true" ] && { echo "#"; echo "# Deleting source directory..."; rm -rf "$BASEDIR"; echo "# done." } +[ "$NODELETE_SOURCE" != "true" ] && { echo "#"; echo "# Deleting source directory..."; rm -rf "$BASEDIR"; echo "# done."; } exit 0 |