diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index e66ce50..65619a3 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/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-distros.world)== [overlay-distros] -world = 125 +world = 126 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network index 49db996..4703f6f 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/network +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network @@ -3,6 +3,7 @@ #?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CDS+)!=# net-dialup/pptpclient net-dialup/rp-pppoe +net-dialup/xl2tpd net-dns/bind-tools net-firewall/shorewall net-misc/ntp @@ -23,7 +24,6 @@ gnome-extra/nm-applet #?in(os_linux_pkglist, CDS, CDS+)!=# net-dialup/ppp net-dialup/pptpd -net-dialup/xl2tpd net-dns/ddclient net-firewall/ipsec-tools net-firewall/iptables diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/125 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/126 similarity index 64% rename from profiles/templates/3.2/6_ac_update_sync/world/update/100-199/125 rename to profiles/templates/3.2/6_ac_update_sync/world/update/100-199/126 index d5f15db..c97fa72 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/125 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/126 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<125 +# Calculate format=world name=world ini(overlay-distros.world)<126 -#-ini(overlay-distros.world,125)-# +#-ini(overlay-distros.world,126)-# #?in(os_linux_pkglist, CLD+)!=# app-office/calligra @@ -10,3 +10,7 @@ kde-apps/kompare #?in(os_linux_pkglist, CLDX+)!=# app-misc/xmind #in# + +#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# +net-dialup/xl2tpd +#in#