From f70c2c4277f142c9f2631d2370aefd5ea7846827dbb0fc0bab6dd5841886fb79 Mon Sep 17 00:00:00 2001 From: Guilherme Moro Date: Wed, 17 Nov 2021 09:38:12 +0000 Subject: [PATCH] Accepting request 931035 from home:favogt:jeossnapfix - Support new location of the snapper config templates OBS-URL: https://build.opensuse.org/request/show/931035 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=66 --- config.sh | 3 ++- kiwi-templates-JeOS.changes | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 5ec449b..53fb253 100644 --- a/config.sh +++ b/config.sh @@ -98,7 +98,8 @@ if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then # we can't call snapper here as the .snapshots subvolume # already exists and snapper create-config doesn't like # that. - cp /etc/snapper/config-templates/default /etc/snapper/configs/root + cp /etc/snapper/config-templates/default /etc/snapper/configs/root \ + || cp /usr/share/snapper/config-templates/default /etc/snapper/configs/root # Change configuration to match SLES12-SP1 values sed -i -e '/^TIMELINE_CREATE=/s/yes/no/' /etc/snapper/configs/root sed -i -e '/^NUMBER_LIMIT=/s/50/10/' /etc/snapper/configs/root diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 1784933..48ae612 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -3,6 +3,11 @@ Tue Nov 16 13:07:23 UTC 2021 - Fabian Vogt - Install AppArmor pattern and audit +------------------------------------------------------------------- +Fri Nov 12 08:29:40 UTC 2021 - Fabian Vogt + +- Support new location of the snapper config templates + ------------------------------------------------------------------- Mon Oct 18 11:20:51 UTC 2021 - Fabian Vogt