Skip to content

Commit

Permalink
scylla_repository: fix installing of older unified packages
Browse files Browse the repository at this point in the history
support of older releases unified packages
that we still need to patch the systemctl calls from taking
place
  • Loading branch information
fruch committed Sep 5, 2023
1 parent b305301 commit 04a9519
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ccmlib/scylla_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,7 @@ def download_packages(version_dir, packages, s3_url, scylla_product, version, ve

download_version(version=version, verbose=verbose, url=packages.scylla_jmx_package,
target_dir=os.path.join(tmp_download, 'scylla-jmx'))

shutil.move(tmp_download, version_dir)
shutil.copytree(tmp_download, version_dir, dirs_exist_ok=True)

return package_version, packages

Expand Down Expand Up @@ -571,6 +570,7 @@ def run_scylla_unified_install_script(install_dir, target_dir, package_version):
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(fr'''sed -i 's/if check_usermode_support; then/if false; then/' ./**/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 04a9519

Please sign in to comment.