From f47d444bfe7fa0fe154b2b16a02395614b049b02 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 19 Dec 2022 10:14:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BE=D0=B1=D0=BE=D0=B8=20xfce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2_ac_install_merge/xfce-base/xfdesktop/xfce-stripes.png | 1 + .../2_ac_install_merge/xfce-base/xfdesktop/xfce-teal.jpg | 1 + .../2_ac_install_merge/xfce-base/xfdesktop/xfce-verticals.png | 1 + profiles/templates/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/6_ac_update_sync/remerge/2022/20221219 | 4 ++++ 5 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-stripes.png create mode 100644 profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-teal.jpg create mode 100644 profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-verticals.png create mode 100644 profiles/templates/6_ac_update_sync/remerge/2022/20221219 diff --git a/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-stripes.png b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-stripes.png new file mode 100644 index 000000000..f8ee42ae6 --- /dev/null +++ b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-stripes.png @@ -0,0 +1 @@ +# Calculate append=remove path=/usr/share/backgrounds/xfce diff --git a/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-teal.jpg b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-teal.jpg new file mode 100644 index 000000000..f8ee42ae6 --- /dev/null +++ b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-teal.jpg @@ -0,0 +1 @@ +# Calculate append=remove path=/usr/share/backgrounds/xfce diff --git a/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-verticals.png b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-verticals.png new file mode 100644 index 000000000..f8ee42ae6 --- /dev/null +++ b/profiles/templates/2_ac_install_merge/xfce-base/xfdesktop/xfce-verticals.png @@ -0,0 +1 @@ +# Calculate append=remove path=/usr/share/backgrounds/xfce diff --git a/profiles/templates/6_ac_update_sync/remerge/0-ini b/profiles/templates/6_ac_update_sync/remerge/0-ini index 8e6b79b42..6bcb39791 100644 --- a/profiles/templates/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20221116 +remerge = 20221219 diff --git a/profiles/templates/6_ac_update_sync/remerge/2022/20221219 b/profiles/templates/6_ac_update_sync/remerge/2022/20221219 new file mode 100644 index 000000000..e95b941c2 --- /dev/null +++ b/profiles/templates/6_ac_update_sync/remerge/2022/20221219 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=xfce-base/xfdesktop + +[overlay-calculate] +remerge = #-cl_pass_file-#