diff --git a/install_mysql.sh b/install_mysql.sh index 3cb830b..a3d02c4 100755 --- a/install_mysql.sh +++ b/install_mysql.sh @@ -493,6 +493,9 @@ while [ "X$OK" != "Xja" -a "X$OK" != "Xnein" ]; do done if [ "$OK" = "ja" ]; then SYSTEMD_EXISTS=false + VSERVER_GUEST=true +else + VSERVER_GUEST=false fi if [[ "$MYSQL_MAJOR_VERSION" -lt 5 ]] \ @@ -591,6 +594,8 @@ else echo "MySQL SysyVinit Script....: $MYSQL_SYSV_INIT_SCRIPT" fi echo "" +echo "VServer guest system......: $VSERVER_GUEST" +echo "" echononl "einverstanden [ja/nein]: " read OK while [ "X$OK" != "Xja" -a "X$OK" != "XJa" -a "X$OK" != "Xnein" -a "X$OK" != "XNein" ] @@ -693,6 +698,8 @@ else echo "## - Starmethode...............: SysVinit Script" >> ${logdir}/main.log echo "## - MySQL SysyVinit Script....: $MYSQL_SYSV_INIT_SCRIPT" >> ${logdir}/main.log fi +echo "## -" +echo "## - VServer guest system......: $VSERVER_GUEST" echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log @@ -723,6 +730,7 @@ echo "INSTALL_SYSTEMD_SERVICE=$INSTALL_SYSTEMD_SERVICE" >> ${logdir}/main.log echo "MYSQL_SERVICE_FILE=$MYSQL_SERVICE_FILE" >> ${logdir}/main.log echo "SYSTEMD_PID_DIR=$SYSTEMD_PID_DIR" >> ${logdir}/main.log echo "MYSQL_SYSV_INIT_SCRIPT=$MYSQL_SYSV_INIT_SCRIPT" >> ${logdir}/main.log +echo "VSERVER_GUEST=$VSERVER_GUEST" >> ${logdir}/main.log _MYSQL_INITSCRIPT= @@ -1029,7 +1037,7 @@ if ! $UPDATE_MYSQL ; then echo_ok else echo_failed - fatal Kann MySQL Packete nicht deinstalieren.. + fatal Kann MySQL Pakete nicht deinstalieren.. fi else echo_skipped @@ -4380,27 +4388,31 @@ fi echo echononl "Reenable crontab for user root .." -echo "" >> ${logdir}/main.log -echo "Reenable crontab for user root" >> ${logdir}/main.log -echo "## -" >> ${logdir}/main.log -echo "crontab -u root $_CRONTAB_BAKUP_FILE" >> ${logdir}/main.log -crontab -u root $_CRONTAB_BAKUP_FILE >> ${logdir}/main.log 2>&1 -if [ "$?" = "0" ]; then - echo_ok -else - echo_failed -fi +if $_crontab_found ; then + echo "" >> ${logdir}/main.log + echo "Reenable crontab for user root" >> ${logdir}/main.log + echo "## -" >> ${logdir}/main.log + echo "crontab -u root $_CRONTAB_BAKUP_FILE" >> ${logdir}/main.log + crontab -u root $_CRONTAB_BAKUP_FILE >> ${logdir}/main.log 2>&1 + if [ "$?" = "0" ]; then + echo_ok + else + echo_failed + fi -echononl "Remove crontab backup file .." -echo "" >> ${logdir}/main.log -echo "## - Remove crontab backup file" >> ${logdir}/main.log -echo "## -" >> ${logdir}/main.log -echo "rm $_CRONTAB_BAKUP_FILE" >> ${logdir}/main.log -rm -f $_CRONTAB_BAKUP_FILE -if [ "$?" = "0" ]; then - echo_ok + echononl "Remove crontab backup file .." + echo "" >> ${logdir}/main.log + echo "## - Remove crontab backup file" >> ${logdir}/main.log + echo "## -" >> ${logdir}/main.log + echo "rm $_CRONTAB_BAKUP_FILE" >> ${logdir}/main.log + rm -f $_CRONTAB_BAKUP_FILE + if [ "$?" = "0" ]; then + echo_ok + else + echo_failed + fi else - echo_failed + echo_skipped fi info "See '${logdir}/main.log' for more details."