55d2d8fea0ceb0069d98e241e8a5234638478a53 max Wed Jan 24 09:34:15 2024 -0800 gbic fix: prefer service over systemd commands, as docker containers do not have systemd at all, no redmine diff --git src/product/installer/browserSetup.sh src/product/installer/browserSetup.sh index ab08195..fd2c128 100644 --- src/product/installer/browserSetup.sh +++ src/product/installer/browserSetup.sh @@ -1698,48 +1698,52 @@ echo2 this machine. New Genome Browser user accounts will not receive confirmation emails. echo2 To change this, edit the file $APACHEDIR/cgi-bin/hg.conf and modify the settings echo2 'that start with "login.", mainly "login.mailReturnAddr"'. echo2 echo2 Feel free to send any questions to our mailing list genome-mirror@soe.ucsc.edu . waitKey } # stop the mysql database server, so we can write into its data directory function stopMysql { if [ -f /etc/init.d/mysql ]; then service mysql stop elif [ -f /etc/init.d/mysqld ]; then service mysqld stop + elif [ -f /etc/init.d/mariadb ]; then + service mariadb stop elif [ -f /usr/lib/systemd/system/mariadb.service ]; then # RHEL 7, etc use systemd instead of SysV systemctl stop mariadb elif [ -f /usr/lib/systemd/system/mysql.service ]; then # at least seen in Fedora 17 systemctl stop mysql else echo2 Could not find mysql nor mysqld file in /etc/init.d nor a systemd command. Please email genome-mirror@soe.ucsc.edu. fi } # start the mysql database server function startMysql { if [ -f /etc/init.d/mysql ]; then service mysql start elif [ -f /etc/init.d/mysqld ]; then service mysqld start + elif [ -f /etc/init.d/mariadb ]; then + service mariadb start elif [ -f /usr/lib/systemd/system/mariadb.service ]; then # RHEL 7, etc use systemd instead of SysV systemctl start mariadb elif [ -f /usr/lib/systemd/system/mysql.service ]; then # at least seen in Fedora 17 systemctl start mysql else echo2 Could not find mysql nor mysqld file in /etc/init.d nor a systemd command. Please email genome-mirror@soe.ucsc.edu. fi } function mysqlCheck # check all mysql tables. Rarely, some of them are in an unclosed state on the download server, this command will close them { echo2 Checking all mysql tables after the download to make sure that they are closed