From 7edd0e3aee318f5c2b50b29e07a11fb5af5a1cab Mon Sep 17 00:00:00 2001 From: segfault Date: Wed, 3 Apr 2019 14:32:11 +0200 Subject: [PATCH] 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. --- .../etc/sudoers.d/zzz_persistence-setup | 2 +- .../usr/local/bin/tails-additional-software-config | 2 +- .../usr/local/sbin/tails-additional-software | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup b/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup index 456d03b31e..91a41f74f0 100644 --- a/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup +++ b/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup @@ -1,4 +1,4 @@ -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 "" diff --git a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config index 41e0031673..b03d60aefc 100755 --- a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config +++ b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config @@ -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 diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software index 4c3379e92a..2e4bacbb8a 100755 --- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software +++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software @@ -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() -- GitLab