summaryrefslogtreecommitdiffstats
path: root/satellit_installer/includes/10-purge_install.inc
diff options
context:
space:
mode:
authorSimon Rettberg2014-10-22 19:13:05 +0200
committerSimon Rettberg2014-10-22 19:13:05 +0200
commit0d8dded26c5c1934eb1f4dd85228595c6eb43a0a (patch)
treee43874c96bd0e4404c4f47809ffbba2c97b87dc0 /satellit_installer/includes/10-purge_install.inc
parentAdd open-vm-tools (diff)
downloadsetup-scripts-0d8dded26c5c1934eb1f4dd85228595c6eb43a0a.tar.gz
setup-scripts-0d8dded26c5c1934eb1f4dd85228595c6eb43a0a.tar.xz
setup-scripts-0d8dded26c5c1934eb1f4dd85228595c6eb43a0a.zip
Outsource and translate firstrun.sh, rename variables
- Moved the firstrun script to a static file to make its handling easier (no more escaping hell) - firstrun.sh is now in German, as it will be run by the end user - Also renamed some variables to better fit their purpose (LOGDIR, INSTALLDIR)
Diffstat (limited to 'satellit_installer/includes/10-purge_install.inc')
-rw-r--r--satellit_installer/includes/10-purge_install.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/satellit_installer/includes/10-purge_install.inc b/satellit_installer/includes/10-purge_install.inc
index 921ae11..bc109c8 100644
--- a/satellit_installer/includes/10-purge_install.inc
+++ b/satellit_installer/includes/10-purge_install.inc
@@ -1,6 +1,6 @@
read_password() {
- MYSQL_ROOT_PASS="$(grep MYSQL_ROOT_PASS "$LOGDIR/config"|cut -f 2 -d "=")" 2>/dev/null
- MYSQL_ROOT_PASS_OLD="$(grep MYSQL_ROOT_PASS "$LOGDIR/config.prerun" | cut -f 2 -d "=")" 2>/dev/null
+ MYSQL_ROOT_PASS="$(grep MYSQL_ROOT_PASS "$CONFIGDIR/config"|cut -f 2 -d "=")" 2>/dev/null
+ MYSQL_ROOT_PASS_OLD="$(grep MYSQL_ROOT_PASS "$CONFIGDIR/config.prerun" | cut -f 2 -d "=")" 2>/dev/null
}
purge_install() {