Commit 7edd0e3a authored by segfault's avatar segfault

tails-additional-software: Adjust arguments to tails-persistence-setup (refs: #16622)

It seems like the perl library which previously nicely handled the tps
command-line arguments now doesn't support taking dashes instead of
underscores anymore.
parent 418d3bd9
Cmnd_Alias PERSISTENCE_SETUP = /usr/bin/tails-persistence-setup "", /usr/bin/tails-persistence-setup --verbose, /usr/bin/tails-persistence-setup --step delete, /usr/bin/tails-persistence-setup --step delete --verbose, /usr/bin/tails-persistence-setup --force-enable-preset AdditionalSoftware
Cmnd_Alias PERSISTENCE_SETUP = /usr/bin/tails-persistence-setup "", /usr/bin/tails-persistence-setup --verbose, /usr/bin/tails-persistence-setup --step delete, /usr/bin/tails-persistence-setup --step delete --verbose, /usr/bin/tails-persistence-setup --force_enable_preset AdditionalSoftware
amnesia ALL = (tails-persistence-setup) NOPASSWD: PERSISTENCE_SETUP
tails-persistence-setup ALL = (root) NOPASSWD: /usr/bin/tails-fix-persistent-volume-permissions ""
......@@ -109,7 +109,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
dialog.destroy()
def cb_persistence_button_clicked(self, button, data=None):
launch_persistence_setup("--force-enable-preset", "AdditionalSoftware")
launch_persistence_setup("--force_enable_preset", "AdditionalSoftware")
self.update_packages_list()
return True
......
......@@ -379,8 +379,8 @@ def handle_removed_packages(packages):
def setup_additional_packages():
"""Enable additional software in persistence."""
launch_persistence_setup("--no-gui",
"--no-display-finished-message",
"--force-enable-preset", "AdditionalSoftware")
"--no-display_finished_message",
"--force_enable_preset", "AdditionalSoftware")
def create_persistence_and_setup_additional_packages(packages):
......@@ -393,8 +393,8 @@ def create_persistence_and_setup_additional_packages(packages):
"""
logging.info("Creating new persistent volume")
launch_persistence_setup("--step", "bootstrap",
"--no-display-finished-message",
"--force-enable-preset", "AdditionalSoftware")
"--no-display_finished_message",
"--force_enable_preset", "AdditionalSoftware")
add_additional_packages(packages, search_new_persistence=True)
# show persistence configuration
launch_persistence_setup()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment