From f54e7c55591db7beb3ca44073aae458429d8f45c Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Tue, 13 Aug 2024 11:23:15 +0300 Subject: [PATCH] [kea-packaging#8] hammer: stop mariadb before setup Attempt to fix `start-stop-daemon: /usr/bin/mysqld_safe is already running` --- hammer.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/hammer.py b/hammer.py index 2d583427c0..4838ecda12 100755 --- a/hammer.py +++ b/hammer.py @@ -1370,17 +1370,9 @@ ssl_key = {cert_dir}/kea-client.key elif system == 'alpine': execute('sudo sed -i "/^skip-networking$/d" /etc/my.cnf.d/mariadb-server.cnf') execute('sudo rc-update add mariadb') - execute('sudo /etc/init.d/mariadb setup', raise_error=False) - - # Wait for setup command to complete. - for i in range(10): - exit_code = execute('sudo pidof mysqld_safe', raise_error=False) - if exit_code != 0: - # Process exited or there was no process to begin with. - break - time.sleep(1) - - execute('sudo /etc/init.d/mariadb restart') + execute('sudo rc-service mariadb stop') + execute('sudo rc-service mariadb setup') + execute('sudo rc-service mariadb restart') cmd = "echo 'DROP DATABASE IF EXISTS keatest;' | sudo mysql -u root" execute(cmd)