diff options
author | Christian Rößler | 2018-04-13 17:12:36 +0200 |
---|---|---|
committer | Christian Rößler | 2018-04-13 17:12:36 +0200 |
commit | 539b0e14ef862a3c87a31a6c9a89127a2a43ddcf (patch) | |
tree | f0f7def80ade5469fccc4d20be6778d558fb359a /satellit_installer | |
parent | [SSUS] updater.template.sh: Check for major version (Deb.) accepts 9 (diff) | |
download | setup-scripts-539b0e14ef862a3c87a31a6c9a89127a2a43ddcf.tar.gz setup-scripts-539b0e14ef862a3c87a31a6c9a89127a2a43ddcf.tar.xz setup-scripts-539b0e14ef862a3c87a31a6c9a89127a2a43ddcf.zip |
[SSPS] Installer now writes version string, some more stuff
Diffstat (limited to 'satellit_installer')
-rw-r--r-- | satellit_installer/includes/00-dirs.inc | 8 | ||||
-rw-r--r-- | satellit_installer/includes/70-write_tmate_config.inc (renamed from satellit_installer/includes/70_write_tmate_config.inc) | 0 | ||||
-rw-r--r-- | satellit_installer/includes/70-write_versionstring.inc | 7 | ||||
-rwxr-xr-x | satellit_installer/satellit_installer | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/satellit_installer/includes/00-dirs.inc b/satellit_installer/includes/00-dirs.inc index 871cd8a..f5a052f 100644 --- a/satellit_installer/includes/00-dirs.inc +++ b/satellit_installer/includes/00-dirs.inc @@ -5,8 +5,10 @@ export TASKMANDIR="/opt/taskmanager/" export OPENSLXDIR="/opt/openslx/" export OPENSLXSRVDIR="/srv/openslx/" export LDADPDIR="/opt/ldadp/" -export TFTPDIR="/srv/openslx/tftp" -export WWWDIR="/srv/openslx/www" +export TFTPDIR="$OPENSLXSRVDIR/tftp" +export WWWDIR="$OPENSLXSRVDIR/www" +export PATH_SLXADMIN="$WWWDIR/slx-admin" export IPXEDIR="$OPENSLXDIR/ipxe" export SLXADMINCACHE="/var/cache/slx-admin" -readonly CONFIGDIR DMSDDIR TASKMANDIR OPENSLXDIR OPENSLXSRVDIR LDADPDIR SYNCDAEMONDIR TFTPDIR WWWDIR +readonly CONFIGDIR DMSDDIR TASKMANDIR OPENSLXDIR OPENSLXSRVDIR LDADPDIR SYNCDAEMONDIR TFTPDIR WWWDIR PATH_SLXADMIN + diff --git a/satellit_installer/includes/70_write_tmate_config.inc b/satellit_installer/includes/70-write_tmate_config.inc index bd68ef4..bd68ef4 100644 --- a/satellit_installer/includes/70_write_tmate_config.inc +++ b/satellit_installer/includes/70-write_tmate_config.inc diff --git a/satellit_installer/includes/70-write_versionstring.inc b/satellit_installer/includes/70-write_versionstring.inc new file mode 100644 index 0000000..397df2f --- /dev/null +++ b/satellit_installer/includes/70-write_versionstring.inc @@ -0,0 +1,7 @@ +write_versionstring() { + # This should be obsolete soon; for now the version string + # is just the date of script run time + VERS=$(date +%Y%j%H) + + echo "$VERS" > "${PATH_SLXADMIN}/version" +} diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer index 84dc5fc..28312f7 100755 --- a/satellit_installer/satellit_installer +++ b/satellit_installer/satellit_installer @@ -193,6 +193,9 @@ tar -z -c -T /dev/null -f /opt/openslx/empty.tgz # Mark vmstore as not mounted touch "/srv/openslx/nfs/.notmounted" +# Write version string +write_versionstring + # cleaning log files, authorized hosts, sources clean_install end_message |