Skip to content

Commit

Permalink
scylla_repository: patch systemctl calls out of install.sh
Browse files Browse the repository at this point in the history
extend fix from 424dd44 to
all `install.sh` scripts inside the unifed-package.

Fix: scylladb/scylla-dtest#3060
(cherry picked from commit 69d3040)
  • Loading branch information
fruch committed Sep 5, 2023
1 parent 3b4caa0 commit 9e9cffe
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ccmlib/scylla_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,10 @@ def run_scylla_unified_install_script(install_dir, target_dir, package_version):
if package_version >= packaging.version.parse('2.2'):
install_opt += ' --without-systemd'
else:
# Patch the jmx install.sh to not use systemctl, in newer versions --without-systemd is covering it
run(r'''sed -i 's/systemctl --user.*/echo "commented out systemctl command"/' ./scylla-jmx/install.sh''',
# Patch the install.sh to not use systemctl, in newer versions --without-systemd is covering it
run(r'''sed -i 's/systemctl --user.*/echo "commented out systemctl command"/' ./install.sh ./**/install.sh''',
cwd=install_dir)
run(r'''sed -i 's|/run/systemd/system|/run|' ./install.sh ./**/install.sh''', cwd=install_dir)

run('''{0}/install.sh --prefix {1} --nonroot{2}'''.format(
install_dir, target_dir, install_opt), cwd=install_dir)
Expand Down

0 comments on commit 9e9cffe

Please sign in to comment.