From 3d7b9aeb0c79c227319c598679135f66c6246254 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Fri, 25 Sep 2015 14:50:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20calcboot?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D1=81=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.3/6_ac_update_sync/world/0-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/world/create/base | 1 - profiles/templates/3.3/6_ac_update_sync/world/update/04 | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.3/6_ac_update_sync/world/update/04 diff --git a/profiles/templates/3.3/6_ac_update_sync/world/0-ini b/profiles/templates/3.3/6_ac_update_sync/world/0-ini index 19da94856..478120de9 100644 --- a/profiles/templates/3.3/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.3/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-calculate.world)== [overlay-calculate] -world = 3 +world = 4 diff --git a/profiles/templates/3.3/6_ac_update_sync/world/create/base b/profiles/templates/3.3/6_ac_update_sync/world/create/base index 625b4c6ce..20e9a984d 100644 --- a/profiles/templates/3.3/6_ac_update_sync/world/create/base +++ b/profiles/templates/3.3/6_ac_update_sync/world/create/base @@ -9,7 +9,6 @@ sys-apps/calculate-utils:0 sys-apps/calculate-utils:3 sys-apps/openrc sys-apps/v86d -sys-boot/calcboot sys-boot/grub:2 sys-boot/os-prober sys-fs/e2fsprogs diff --git a/profiles/templates/3.3/6_ac_update_sync/world/update/04 b/profiles/templates/3.3/6_ac_update_sync/world/update/04 new file mode 100644 index 000000000..9cabd0b42 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/world/update/04 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-calculate.world)<4 + +#-ini(overlay-calculate.world,4)-# + +#?in(os_linux_pkglist, base)!=# +!sys-boot/calcboot +#in#