From 97fa742c74d683618e5889132a0d0116bfeac2dd Mon Sep 17 00:00:00 2001 From: unman Date: Sat, 26 Nov 2022 16:16:21 +0000 Subject: [PATCH] Reader qube - Fix template setting. Closes #20 --- reader.spec | 8 ++++++-- reader/clone.sls | 10 ++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/reader.spec b/reader.spec index b926388..8c99407 100644 --- a/reader.spec +++ b/reader.spec @@ -1,5 +1,5 @@ Name: 3isec-qubes-reader -Version: 0.1 +Version: 0.2 Release: 1%{?dist} Summary: Prepares useful software in Qubes @@ -7,7 +7,7 @@ License: GPLv3+ SOURCE0: reader %description -This package creates a minimal template configured with a range of useful software. +This package creates a minimal template configured with a range of useful software, of particular use to terminal users. The template is set as the default template and as template for the Debian disposable template. Removing this package does NOT revert these changes. @@ -28,11 +28,15 @@ cp -rv %{SOURCE0}/ %{buildroot}/srv/salt if [ $1 -eq 1 ]; then qubesctl state.apply reader.clone qubesctl --skip-dom0 --targets=template-reader state.apply reader.install +elif [ $1 -eq 2 ]; then + qubesctl state.apply reader.clone fi %preun %changelog +* Sat Nov 26 2022 unman +- Fix error on setting templates * Fri Sep 09 2022 unman - First Build diff --git a/reader/clone.sls b/reader/clone.sls index d289bd7..4bba6d8 100644 --- a/reader/clone.sls +++ b/reader/clone.sls @@ -7,10 +7,8 @@ qvm-clone-id: - name: template-reader - source: debian-11 -change_default: - 'qubes-prefs default_template template-reader': - cmd.run +'qubes-prefs default_template template-reader': + cmd.run -change_template: - 'qvm-prefs debian-11-dvm template template-reader': - cmd.run +'qvm-prefs debian-11-dvm template template-reader': + cmd.run