From bb836e5d46003e7986517dcc42ac3c74a3f5ad3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 2 Nov 2016 06:07:00 +0100 Subject: [PATCH] Call qvm-template-postprocess if present instead of internal script Actions required after template installation differs between Qubes releases. Lets keep template builder universal and just call appropriate command provided by version-specific component (probably qubes-core-dom0 package), if present. Otherwise use old script (for Qubes before 4.0). Add --really parameter to prevent misuse. This tool may override template data without further confirmation. QubesOS/qubes-issues#2412 --- templates.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates.spec b/templates.spec index 55075d0..212682b 100644 --- a/templates.spec +++ b/templates.spec @@ -64,6 +64,12 @@ fi %post + +if command -v qvm-template-postprocess >/dev/null 2>&1; then + qvm-template-postprocess --really post-install %{template_name} %{dest_dir} + exit $? +fi + echo "--> Processing the root.img... (this might take a while)" cat %{dest_dir}/root.img.part.* | tar --sparse -xf - -C %{dest_dir} rm -f %{dest_dir}/root.img.part.* @@ -133,6 +139,12 @@ exit 0 %preun if [ "$1" = 0 ] ; then # no more packages left + + if command -v qvm-template-postprocess >/dev/null 2>&1; then + qvm-template-postprocess --really pre-remove %{template_name} %{dest_dir} + exit $? + fi + # First remove DispVM template (even if not exists...) qvm-remove --force-root -q %{template_name}-dvm