From 89fc4113b7770ac863596da670c47680944d0cd7 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 16 Jan 2015 17:57:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=203.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculate-desktop/.calculate_directory | 2 -- .../1-live/sys-apps/calculate-desktop/logout.stop | 1 - .../1-live/sys-apps/calculate-utils/fixOpenrc | 11 ----------- .../{1-live => 1-merge}/.calculate_directory | 0 .../app-admin/.calculate_directory | 0 .../app-admin/sudo/.calculate_directory | 0 .../{1-live => 1-merge}/app-admin/sudo/livecd | 0 .../app-emulation/.calculate_directory | 0 .../virtualbox-bin/.calculate_directory | 0 .../app-emulation/virtualbox-bin/modprobe | 0 .../gnome-base/.calculate_directory | 0 .../gnome-base/gdm/.calculate_directory | 0 .../gnome-base/gdm/99-dconf-update | 0 .../gnome-base/gnome-keyring/.calculate_directory | 0 .../gnome-keyring/prepare_gnome_keyring_caps | 0 .../gnome-extra/.calculate_directory | 0 .../gnome-extra/nm-applet/.calculate_directory | 0 .../gnome-extra/nm-applet/nm-applet.desktop | 0 .../kde-base/.calculate_directory | 0 .../kdebase-startkde/.calculate_directory | 0 .../kde-base/kdebase-startkde/startkde | 0 .../kde-base/kdm/.calculate_directory | 0 .../kde-base/kdm/.default.face.icon | 0 .../{1-live => 1-merge}/kde-base/kdm/kdmrc | 0 .../kde-base/khotkeys/.calculate_directory | 0 .../kde-base/khotkeys/media.khotkeys | 0 .../kde-misc/.calculate_directory | 0 .../networkmanagement/.calculate_directory | 0 .../plasma-applet-networkmanagement.desktop | 0 .../kde-misc/plasma-nm/.calculate_directory | 0 .../plasma-applet-networkmanagement.desktop | 0 .../mail-mta/.calculate_directory | 0 .../mail-mta/postfix/.calculate_directory | 0 .../mail-mta/postfix/server.clr | 0 .../mail-mta/postfix/server.crt | 0 .../mail-mta/postfix/server.key | 0 .../mail-mta/postfix/server.pem | 0 .../media-gfx/.calculate_directory | 0 .../kdm-themes-calculate/.calculate_directory | 0 .../media-gfx/kdm-themes-calculate/bg.jpg | 0 .../media-gfx/kdm-themes-calculate/bg.jpg.14-r1 | 0 .../.calculate_directory | 0 .../plymouth-themes-calculate/calculate.script | 0 .../media-sound/.calculate_directory | 0 .../media-sound/alsa-utils/.calculate_directory | 0 .../media-sound/alsa-utils/asound.conf | 0 .../net-im/.calculate_directory | 0 .../net-im/ejabberd/.calculate_directory | 0 .../net-im/ejabberd/server.clr | 0 .../net-im/ejabberd/server.crt | 0 .../net-im/ejabberd/server.key | 0 .../net-im/ejabberd/server.pem | 0 .../net-irc/.calculate_directory | 0 .../net-irc/hexchat/.calculate_directory | 0 .../net-irc/hexchat/hexchat-2.9.desktop | 0 .../net-mail/.calculate_directory | 0 .../net-mail/dovecot/.calculate_directory | 0 .../net-mail/dovecot/server.clr | 0 .../net-mail/dovecot/server.crt | 0 .../net-mail/dovecot/server.key | 0 .../net-mail/dovecot/server.pem | 0 .../net-misc/.calculate_directory | 0 .../net-misc/networkmanager/.calculate_directory | 0 ...op.NetworkManager.settings.modify.system.rules | 0 .../net-misc/networkmanager/NetworkManager.conf | 0 .../networkmanager/default/.calculate_directory | 0 .../networkmanager/default/NetworkManager | 0 .../networkmanager/default/NetworkManager.remove | 0 .../dispatcher.d/.calculate_directory | 0 .../networkmanager/dispatcher.d/ip-down.sh | 0 .../net-misc/networkmanager/dispatcher.d/ip-up.sh | 0 .../runservice/.calculate_directory | 0 .../runservice/restartNetworkManager | 0 .../system-connections/.calculate_directory | 0 .../networkmanager/system-connections/Auto_eth0 | 0 .../system-connections/Auto_eth0.del | 0 .../networkmanager/system-connections/Auto_eth1 | 0 .../system-connections/Auto_eth1.del | 0 .../networkmanager/system-connections/Auto_eth2 | 0 .../system-connections/Auto_eth2.del | 0 .../networkmanager/system-connections/Auto_eth3 | 0 .../system-connections/Auto_eth3.del | 0 .../net-misc/ntp/.calculate_directory | 0 .../{1-live => 1-merge}/net-misc/ntp/clocksync | 0 .../net-misc/openssh/.calculate_directory | 0 .../net-misc/openssh/default/.calculate_directory | 0 .../net-misc/openssh/default/sshd | 0 .../net-misc/openssh/init.d/sshd | 0 .../net-misc/wget/.calculate_directory | 0 .../{1-live => 1-merge}/net-misc/wget/wgetrc | 0 .../net-wireless/.calculate_directory | 0 .../net-wireless/bluez/.calculate_directory | 0 .../net-wireless/bluez/bluetooth | 0 .../net-wireless/bluez/main.conf | 0 .../sys-apps/.calculate_directory | 0 .../sys-apps/baselayout/.calculate_directory | 0 .../{1-live => 1-merge}/sys-apps/baselayout/hosts | 0 .../sys-apps/baselayout/localtime | 0 .../sys-apps/baselayout/motd.en | 0 .../sys-apps/baselayout/motd.ru | 0 .../sys-apps/baselayout/timezone | 0 .../calculate-client/.calculate_directory | 0 .../calculate-client/default/.calculate_directory | 0 .../sys-apps/calculate-client/default/client | 0 .../sys-apps/calculate-utils/.calculate_directory | 0 .../sys-apps/calculate-utils/ini.env | 0 .../sys-apps/calculate-utils/updateSymlinks | 0 .../sys-apps/openrc/.calculate_directory | 0 .../sys-apps/openrc/conf.d/hostname | 0 .../sys-apps/openrc/conf.d/hwclock | 0 .../sys-apps/openrc/conf.d/keymaps | 0 .../sys-apps/openrc/conf.d/local.start | 0 .../sys-apps/openrc/conf.d/net | 0 .../openrc/default.runlevels/.calculate_directory | 0 .../sys-apps/openrc/default.runlevels/numlock | 0 .../sys-apps/openrc/env.d/02locale | 0 .../sys-apps/openrc/init.d/.calculate_directory | 0 .../sys-apps/openrc/init.d/net.eth0 | 0 .../sys-apps/openrc/init.d/net.eth0.del | 0 .../sys-apps/openrc/init.d/net.eth0.old | 0 .../sys-apps/openrc/init.d/net.eth1 | 0 .../sys-apps/openrc/init.d/net.eth1.del | 0 .../sys-apps/openrc/init.d/net.eth1.old | 0 .../sys-apps/openrc/init.d/net.eth2 | 0 .../sys-apps/openrc/init.d/net.eth2.del | 0 .../sys-apps/openrc/init.d/net.eth2.old | 0 .../sys-apps/openrc/init.d/net.eth3 | 0 .../sys-apps/openrc/init.d/net.eth3.del | 0 .../sys-apps/openrc/init.d/net.eth3.old | 0 .../sys-apps/openrc/local.d/fixsystemtime.start | 0 .../{1-live => 1-merge}/sys-apps/openrc/rc.conf | 0 .../openrc/runservice/.calculate_directory | 0 .../openrc/runservice/restartOpenrcLocale | 0 .../openrc/runservice/restartOpenrcNetwork | 0 .../sys-apps/portage/.calculate_directory | 0 .../sys-apps/portage/make.conf | 0 .../sys-apps/preload/.calculate_directory | 0 .../sys-apps/preload/boot/.calculate_directory | 0 .../sys-apps/preload/boot/preload | 0 .../sys-apps/preload/default/.calculate_directory | 0 .../sys-apps/preload/default/preload | 0 .../sys-auth/.calculate_directory | 0 .../sys-auth/consolekit/.calculate_directory | 0 .../consolekit/org.freedesktop.consolekit.policy | 0 .../sys-auth/nss_ldap/.calculate_directory | 0 .../sys-auth/nss_ldap/ldap.conf | 0 .../nss_ldap/undomain/.calculate_directory | 0 .../sys-auth/nss_ldap/undomain/ldap.conf | 0 .../sys-boot/.calculate_directory | 0 .../sys-boot/grub/.calculate_directory | 0 .../sys-boot/grub/create_hostonly | 0 .../sys-boot/grub/default.grub | 0 .../sys-boot/grub/default.grub.default | 0 .../sys-boot/grub/default.grub.usbhdd | 0 .../{1-live => 1-merge}/sys-boot/grub/menu.lst | 0 .../{1-live => 1-merge}/sys-boot/grub/update-grub | 0 .../sys-boot/grub/update-grub.new | 0 .../sys-devel/.calculate_directory | 0 .../sys-devel/prelink/.calculate_directory | 0 .../sys-devel/prelink/conf.d/prelink | 0 .../sys-fs/.calculate_directory | 0 .../sys-fs/lvm2/.calculate_directory | 0 .../{1-live => 1-merge}/sys-fs/lvm2/lvm | 0 .../sys-fs/mdadm/.calculate_directory | 0 .../{1-live => 1-merge}/sys-fs/mdadm/mdadm | 0 .../sys-fs/udev/.calculate_directory | 0 .../sys-fs/udev/70-persistent-net.rules.remove | 0 .../{1-live => 1-merge}/sys-fs/udev/udev | 0 .../sys-kernel/.calculate_directory | 0 .../sys-kernel/calckernel/.calculate_directory | 0 .../sys-kernel/calckernel/grub.conf.fix | 0 .../sys-power/.calculate_directory | 0 .../upower-pm-utils/.calculate_directory | 0 .../upower-pm-utils/80-upower-suspend.rules | 0 .../upower-pm-utils/org.freedesktop.upower.policy | 0 .../sys-process/.calculate_directory | 0 .../sys-process/vixie-cron/.calculate_directory | 0 .../sys-process/vixie-cron/calculate-update | 0 .../x11-base/.calculate_directory | 0 .../x11-base/xorg-server/.calculate_directory | 0 .../x11-base/xorg-server/X11/xorg.conf | 0 .../X11/xorg.conf.d/.calculate_directory | 0 .../xorg-server/X11/xorg.conf.d/keyboard.conf | 0 .../x11-base/xorg-server/X11/xorg.conf.default | 0 .../x11-base/xorg-server/conf.d/xdm | 0 .../x11-misc/.calculate_directory | 0 .../x11-misc/light-locker/.calculate_directory | 0 .../x11-misc/light-locker/light-locker.desktop | 0 .../x11-misc/slim/.calculate_directory | 0 .../{1-live => 1-merge}/x11-misc/slim/slim.conf | 0 .../3-desktop}/.calculate_directory | 0 .../3-desktop}/install/.calculate_directory | 0 .../install/gnome-base}/.calculate_directory | 0 .../install/gnome-base/gdm-2/.calculate_directory | 0 .../gdm-2/PostLogin/.calculate_directory | 0 .../install/gnome-base/gdm-2/PostLogin/Default | 0 .../gdm-2/PostSession/.calculate_directory | 0 .../gnome-base/gdm-2/PostSession/00Default | 0 .../gnome-base/gdm-2/PostSession/05Default | 0 .../install/gnome-base/gdm-3/.calculate_directory | 0 .../install/gnome-base/gdm-3/00-user.desktop | 0 .../gdm-3/PostLogin/.calculate_directory | 0 .../gnome-base/gdm-3/PostLogin/00-calculate | 0 .../install/gnome-base/gdm-3/PostLogin/Default | 0 .../gdm-3/PostSession/.calculate_directory | 0 .../gnome-base/gdm-3/PostSession/00Default | 0 .../gnome-base/gdm-3/PostSession/05Default | 0 .../gnome-base/gnome-shell/.calculate_directory | 0 .../gnome-base/gnome-shell/gnome-shell.css | 0 .../install/gnome-base/gnome-shell/loginDialog.js | 0 .../gnome-base/gnome-shell/screenShield.js | 0 .../install/kde-base}/.calculate_directory | 0 .../install/kde-base/kdm/.calculate_directory | 0 .../3-desktop}/install/kde-base/kdm/kdmrc | 0 .../install/lxde-base}/.calculate_directory | 0 .../install/lxde-base/lxdm/.calculate_directory | 0 .../3-desktop}/install/lxde-base/lxdm/PostLogout | 0 .../3-desktop}/install/lxde-base/lxdm/Pre | 0 .../3-desktop}/install/lxde-base/lxdm/PreLogin | 0 .../3-desktop}/install/lxde-base/lxdm/PreReboot | 0 .../3-desktop}/install/lxde-base/lxdm/PreShutdown | 0 .../3-desktop}/install/lxde-base/lxdm/pam-lxdm | 0 .../install/x11-misc}/.calculate_directory | 0 .../lightdm-gtk-greeter/.calculate_directory | 0 .../x11-misc/lightdm-gtk-greeter/greeter.ui | 0 .../lightdm-gtk-greeter/lightdm-gtk-greeter.conf | 0 .../wallpapers/.calculate_directory | 0 .../wallpapers/calculate-logo.png | Bin .../install/x11-misc/lightdm/.calculate_directory | 0 .../3-desktop}/install/x11-misc/lightdm/99lightdm | 0 .../install/x11-misc/lightdm/lightdm.conf | 0 .../install/x11-misc/lightdm/pam-lightdm | 0 .../install/x11-misc/slim/.calculate_directory | 0 .../3-desktop}/install/x11-misc/slim/slim.conf | 0 .../3.3/3_ac_install_live/3-desktop/remerge | 1 + .../3-desktop}/uninstall/.calculate_directory | 0 .../uninstall/gnome-base}/.calculate_directory | 0 .../gnome-base/gdm-2/.calculate_directory | 0 .../gdm-2/PostLogin/.calculate_directory | 0 .../uninstall/gnome-base/gdm-2/PostLogin/Default | 0 .../gdm-2/PostSession/.calculate_directory | 0 .../gnome-base/gdm-2/PostSession/00Default | 0 .../gnome-base/gdm-2/PostSession/05Default | 0 .../gnome-base/gdm-3/.calculate_directory | 0 .../uninstall/gnome-base/gdm-3/00-user.desktop | 0 .../gdm-3/PostLogin/.calculate_directory | 0 .../gnome-base/gdm-3/PostLogin/00-calculate | 0 .../uninstall/gnome-base/gdm-3/PostLogin/Default | 0 .../gdm-3/PostSession/.calculate_directory | 0 .../gnome-base/gdm-3/PostSession/00Default | 0 .../gnome-base/gdm-3/PostSession/05Default | 0 .../uninstall/kde-base}/.calculate_directory | 0 .../uninstall/kde-base/kdm/.calculate_directory | 0 .../3-desktop}/uninstall/kde-base/kdm/kdmrc | 0 .../uninstall/lightdm/.calculate_directory | 0 .../3-desktop}/uninstall/lightdm/lightdm.conf | 0 .../uninstall/lxde-base}/.calculate_directory | 0 .../uninstall/lxde-base/lxdm/.calculate_directory | 0 .../uninstall/lxde-base/lxdm/PostLogout | 0 .../3-desktop}/uninstall/lxde-base/lxdm/PreLogin | 0 .../3-desktop}/uninstall/lxde-base/lxdm/PreReboot | 0 .../uninstall/lxde-base/lxdm/PreShutdown | 0 .../uninstall/x11-misc/.calculate_directory | 1 + .../uninstall/x11-misc/slim/.calculate_directory | 0 .../3-desktop}/uninstall/x11-misc/slim/slim.conf | 0 .../3.3/4_ac_desktop_merge/.calculate_directory | 1 - .../3.3/4_ac_desktop_merge/README-eng.txt | 14 -------------- .../3.3/4_ac_desktop_merge/README-rus.txt | 13 ------------- .../templates/3.3/4_ac_desktop_merge/reconfigure | 1 - .../3.3/5_ac_client_undomain/.calculate_directory | 2 +- .../templates/3.3/5_ac_client_undomain/0-undomain | 4 ++++ .../templates/3.3/5_ac_client_undomain/1-remerge | 4 ++++ .../calculate-client/.calculate_directory | 1 - .../sys-apps/calculate-client/reconfigurePackages | 7 ------- .../5_ac_client_undomain/sys-libs/glibc/nscd.stop | 2 +- .../3.3/9_ac_install_merge/.calculate_directory | 1 + .../3.3/9_ac_install_merge/README-eng.txt | 13 +++++++++++++ .../3.3/9_ac_install_merge/README-rus.txt | 13 +++++++++++++ .../sys-apps/.calculate_directory | 1 + .../sys-apps/calculate-utils/.calculate_directory | 1 + .../sys-apps/calculate-utils/ini.env | 7 +++++++ 281 files changed, 48 insertions(+), 53 deletions(-) delete mode 100644 profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/.calculate_directory delete mode 100644 profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/logout.stop delete mode 100644 profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/fixOpenrc rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-admin/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-admin/sudo/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-admin/sudo/livecd (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-emulation/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-emulation/virtualbox-bin/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/app-emulation/virtualbox-bin/modprobe (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-base/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-base/gdm/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-base/gdm/99-dconf-update (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-base/gnome-keyring/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-base/gnome-keyring/prepare_gnome_keyring_caps (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-extra/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-extra/nm-applet/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/gnome-extra/nm-applet/nm-applet.desktop (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/kdebase-startkde/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/kdebase-startkde/startkde (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/kdm/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/kdm/.default.face.icon (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/kdm/kdmrc (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/khotkeys/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-base/khotkeys/media.khotkeys (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-misc/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-misc/networkmanagement/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-misc/plasma-nm/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/postfix/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/postfix/server.clr (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/postfix/server.crt (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/postfix/server.key (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/mail-mta/postfix/server.pem (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/kdm-themes-calculate/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/kdm-themes-calculate/bg.jpg (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/plymouth-themes-calculate/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-gfx/plymouth-themes-calculate/calculate.script (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-sound/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-sound/alsa-utils/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/media-sound/alsa-utils/asound.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/ejabberd/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/ejabberd/server.clr (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/ejabberd/server.crt (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/ejabberd/server.key (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-im/ejabberd/server.pem (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-irc/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-irc/hexchat/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-irc/hexchat/hexchat-2.9.desktop (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/dovecot/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/dovecot/server.clr (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/dovecot/server.crt (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/dovecot/server.key (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-mail/dovecot/server.pem (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/NetworkManager.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/default/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/default/NetworkManager (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/default/NetworkManager.remove (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/dispatcher.d/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/dispatcher.d/ip-down.sh (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/dispatcher.d/ip-up.sh (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/runservice/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/runservice/restartNetworkManager (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth0 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth0.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth1 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth1.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth2 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth2.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth3 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/networkmanager/system-connections/Auto_eth3.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/ntp/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/ntp/clocksync (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/openssh/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/openssh/default/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/openssh/default/sshd (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/openssh/init.d/sshd (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/wget/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-misc/wget/wgetrc (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-wireless/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-wireless/bluez/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-wireless/bluez/bluetooth (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/net-wireless/bluez/main.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/hosts (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/localtime (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/motd.en (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/motd.ru (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/baselayout/timezone (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-client/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-client/default/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-client/default/client (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-utils/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-utils/ini.env (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/calculate-utils/updateSymlinks (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/conf.d/hostname (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/conf.d/hwclock (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/conf.d/keymaps (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/conf.d/local.start (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/conf.d/net (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/default.runlevels/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/default.runlevels/numlock (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/env.d/02locale (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth0 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth0.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth0.old (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth1 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth1.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth1.old (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth2 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth2.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth2.old (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth3 (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth3.del (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/init.d/net.eth3.old (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/local.d/fixsystemtime.start (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/rc.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/runservice/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/runservice/restartOpenrcLocale (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/openrc/runservice/restartOpenrcNetwork (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/portage/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/portage/make.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/preload/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/preload/boot/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/preload/boot/preload (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/preload/default/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-apps/preload/default/preload (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/consolekit/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/consolekit/org.freedesktop.consolekit.policy (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/nss_ldap/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/nss_ldap/ldap.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/nss_ldap/undomain/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-auth/nss_ldap/undomain/ldap.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/create_hostonly (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/default.grub (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/default.grub.default (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/default.grub.usbhdd (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/menu.lst (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/update-grub (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-boot/grub/update-grub.new (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-devel/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-devel/prelink/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-devel/prelink/conf.d/prelink (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/lvm2/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/lvm2/lvm (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/mdadm/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/mdadm/mdadm (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/udev/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/udev/70-persistent-net.rules.remove (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-fs/udev/udev (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-kernel/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-kernel/calckernel/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-kernel/calckernel/grub.conf.fix (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-power/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-power/upower-pm-utils/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-power/upower-pm-utils/80-upower-suspend.rules (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-power/upower-pm-utils/org.freedesktop.upower.policy (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-process/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-process/vixie-cron/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/sys-process/vixie-cron/calculate-update (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/X11/xorg.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/X11/xorg.conf.default (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-base/xorg-server/conf.d/xdm (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-misc/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-misc/light-locker/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-misc/light-locker/light-locker.desktop (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-misc/slim/.calculate_directory (100%) rename profiles/templates/3.3/3_ac_install_live/{1-live => 1-merge}/x11-misc/slim/slim.conf (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/install/gnome-base => 3_ac_install_live/3-desktop}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/install/kde-base => 3_ac_install_live/3-desktop/install/gnome-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/PostLogin/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/PostLogin/Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/PostSession/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/PostSession/00Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-2/PostSession/05Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/00-user.desktop (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostLogin/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostLogin/00-calculate (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostLogin/Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostSession/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostSession/00Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gdm-3/PostSession/05Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gnome-shell/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gnome-shell/gnome-shell.css (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gnome-shell/loginDialog.js (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/gnome-base/gnome-shell/screenShield.js (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/install/lxde-base => 3_ac_install_live/3-desktop/install/kde-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/kde-base/kdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/kde-base/kdm/kdmrc (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/install/x11-misc => 3_ac_install_live/3-desktop/install/lxde-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/PostLogout (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/Pre (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/PreLogin (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/PreReboot (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/PreShutdown (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/lxde-base/lxdm/pam-lxdm (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/uninstall/gnome-base => 3_ac_install_live/3-desktop/install/x11-misc}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm-gtk-greeter/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm-gtk-greeter/greeter.ui (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm/99lightdm (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm/lightdm.conf (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/lightdm/pam-lightdm (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/slim/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/install/x11-misc/slim/slim.conf (100%) create mode 100644 profiles/templates/3.3/3_ac_install_live/3-desktop/remerge rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/uninstall/kde-base => 3_ac_install_live/3-desktop/uninstall/gnome-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/PostLogin/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/PostLogin/Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/PostSession/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/PostSession/00Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-2/PostSession/05Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/00-user.desktop (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostLogin/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostLogin/00-calculate (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostLogin/Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostSession/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostSession/00Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/gnome-base/gdm-3/PostSession/05Default (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/uninstall/lxde-base => 3_ac_install_live/3-desktop/uninstall/kde-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/kde-base/kdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/kde-base/kdm/kdmrc (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lightdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lightdm/lightdm.conf (100%) rename profiles/templates/3.3/{4_ac_desktop_merge/uninstall/x11-misc => 3_ac_install_live/3-desktop/uninstall/lxde-base}/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lxde-base/lxdm/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lxde-base/lxdm/PostLogout (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lxde-base/lxdm/PreLogin (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lxde-base/lxdm/PreReboot (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/lxde-base/lxdm/PreShutdown (100%) create mode 100644 profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/x11-misc/slim/.calculate_directory (100%) rename profiles/templates/3.3/{4_ac_desktop_merge => 3_ac_install_live/3-desktop}/uninstall/x11-misc/slim/slim.conf (100%) delete mode 100644 profiles/templates/3.3/4_ac_desktop_merge/.calculate_directory delete mode 100644 profiles/templates/3.3/4_ac_desktop_merge/README-eng.txt delete mode 100644 profiles/templates/3.3/4_ac_desktop_merge/README-rus.txt delete mode 100644 profiles/templates/3.3/4_ac_desktop_merge/reconfigure create mode 100644 profiles/templates/3.3/5_ac_client_undomain/0-undomain create mode 100644 profiles/templates/3.3/5_ac_client_undomain/1-remerge delete mode 100644 profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/.calculate_directory delete mode 100644 profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/reconfigurePackages create mode 100644 profiles/templates/3.3/9_ac_install_merge/.calculate_directory create mode 100644 profiles/templates/3.3/9_ac_install_merge/README-eng.txt create mode 100644 profiles/templates/3.3/9_ac_install_merge/README-rus.txt create mode 100644 profiles/templates/3.3/9_ac_install_merge/sys-apps/.calculate_directory create mode 100644 profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory create mode 100644 profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/ini.env diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/.calculate_directory deleted file mode 100644 index 7dd8ab392..000000000 --- a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[desktop])!= path=/etc name=local.d - diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/logout.stop b/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/logout.stop deleted file mode 100644 index 8afb1e88b..000000000 --- a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-desktop/logout.stop +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=remove diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/fixOpenrc b/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/fixOpenrc deleted file mode 100644 index 67c1b1098..000000000 --- a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/fixOpenrc +++ /dev/null @@ -1,11 +0,0 @@ -# Calculate path=/tmp name=fixOpenrc exec=/bin/bash ac_install_disk==off&&cl_merge_pkg!=&&pkg(sys-apps/openrc)!= - -if [[ -z `find /etc/conf.d -name "*cfg*modules" -exec grep "^modules_3" {} \;` ]] -then - find /etc/conf.d -name "*cfg*modules" -delete - if ! rc-config list boot | grep "calculate-builder " &>/dev/null - then - rc-update add calculate-builder boot &>/dev/null - fi -fi -true diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-admin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-admin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-admin/sudo/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-admin/sudo/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-admin/sudo/livecd b/profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/sudo/livecd similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-admin/sudo/livecd rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-admin/sudo/livecd diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/virtualbox-bin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/virtualbox-bin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/virtualbox-bin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/virtualbox-bin/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/virtualbox-bin/modprobe b/profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/virtualbox-bin/modprobe similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/app-emulation/virtualbox-bin/modprobe rename to profiles/templates/3.3/3_ac_install_live/1-merge/app-emulation/virtualbox-bin/modprobe diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gdm/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gdm/99-dconf-update b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gdm/99-dconf-update similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gdm/99-dconf-update rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gdm/99-dconf-update diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gnome-keyring/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gnome-keyring/prepare_gnome_keyring_caps b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-base/gnome-keyring/prepare_gnome_keyring_caps rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/nm-applet/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/nm-applet/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/nm-applet/nm-applet.desktop b/profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/gnome-extra/nm-applet/nm-applet.desktop rename to profiles/templates/3.3/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdebase-startkde/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdebase-startkde/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdebase-startkde/startkde b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdebase-startkde/startkde rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/.default.face.icon b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/.default.face.icon similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/.default.face.icon rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/.default.face.icon diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/kdmrc b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/kdmrc similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/kdm/kdmrc rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/kdm/kdmrc diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/khotkeys/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/khotkeys/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-base/khotkeys/media.khotkeys b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-base/khotkeys/media.khotkeys rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/networkmanagement/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/networkmanagement/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/plasma-nm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/plasma-nm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop b/profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop rename to profiles/templates/3.3/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.clr b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.clr similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.clr rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.clr diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.crt b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.crt similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.crt rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.crt diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.key b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.key similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.key rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.key diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.pem b/profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.pem similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/mail-mta/postfix/server.pem rename to profiles/templates/3.3/3_ac_install_live/1-merge/mail-mta/postfix/server.pem diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/plymouth-themes-calculate/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/plymouth-themes-calculate/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/plymouth-themes-calculate/calculate.script b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/calculate.script similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-gfx/plymouth-themes-calculate/calculate.script rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/calculate.script diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-sound/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-sound/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-sound/alsa-utils/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-sound/alsa-utils/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/media-sound/alsa-utils/asound.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/media-sound/alsa-utils/asound.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.clr b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.clr similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.clr rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.clr diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.crt b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.crt similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.crt rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.crt diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.key b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.key similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.key rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.key diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.pem b/profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.pem similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-im/ejabberd/server.pem rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-im/ejabberd/server.pem diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-irc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-irc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-irc/hexchat/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-irc/hexchat/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-irc/hexchat/hexchat-2.9.desktop b/profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-irc/hexchat/hexchat-2.9.desktop rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.clr b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.clr similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.clr rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.clr diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.crt b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.crt similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.crt rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.crt diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.key b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.key similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.key rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.key diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.pem b/profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.pem similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-mail/dovecot/server.pem rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-mail/dovecot/server.pem diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/NetworkManager.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/NetworkManager.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager.remove b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager.remove rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/ip-down.sh b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/ip-down.sh rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/ip-up.sh b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/dispatcher.d/ip-up.sh rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/runservice/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/runservice/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/runservice/restartNetworkManager b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/runservice/restartNetworkManager rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth0 b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth0 rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth0.del b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth0.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth1 b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth1 rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth1.del b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth1.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth2 b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth2 rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth2.del b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth2.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth3 b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth3 rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth3.del b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/networkmanager/system-connections/Auto_eth3.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/ntp/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/ntp/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/ntp/clocksync b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/ntp/clocksync similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/ntp/clocksync rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/ntp/clocksync diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/default/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/default/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/default/sshd b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/default/sshd rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/init.d/sshd b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/openssh/init.d/sshd rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/wget/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/wget/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-misc/wget/wgetrc b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/wget/wgetrc similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-misc/wget/wgetrc rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/wget/wgetrc diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/bluetooth b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/bluetooth rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/main.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/main.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/net-wireless/bluez/main.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/main.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/hosts b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/hosts similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/hosts rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/hosts diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/localtime b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/localtime similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/localtime rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/localtime diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/motd.en b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/motd.en rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/motd.ru b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/motd.ru rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/timezone b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/timezone similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/baselayout/timezone rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/baselayout/timezone diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/default/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/default/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/default/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/default/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/default/client b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/default/client similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-client/default/client rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-client/default/client diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/ini.env b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.env similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/ini.env rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.env diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/updateSymlinks b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/updateSymlinks similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/calculate-utils/updateSymlinks rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/calculate-utils/updateSymlinks diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/hostname rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/hwclock b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/hwclock rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/keymaps b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/keymaps rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/local.start b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/local.start rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/net b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/conf.d/net rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/default.runlevels/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/default.runlevels/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/default.runlevels/numlock b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/default.runlevels/numlock rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/env.d/02locale b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/env.d/02locale rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0 b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0 rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0.del b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0.old b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.old similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth0.old rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.old diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1 b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1 rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1.del b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1.old b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.old similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth1.old rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.old diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2 b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2 rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2.del b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2.old b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.old similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth2.old rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.old diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3 b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3 similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3 rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3 diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3.del b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3.del rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3.old b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.old similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/init.d/net.eth3.old rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.old diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/local.d/fixsystemtime.start b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/local.d/fixsystemtime.start rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/rc.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/rc.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/restartOpenrcLocale b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/restartOpenrcLocale rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/restartOpenrcNetwork b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/openrc/runservice/restartOpenrcNetwork rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/portage/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/portage/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/portage/make.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/portage/make.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/portage/make.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/portage/make.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/boot/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/boot/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/boot/preload b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/boot/preload similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/boot/preload rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/boot/preload diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/default/preload b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-apps/preload/default/preload rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/consolekit/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/consolekit/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/consolekit/org.freedesktop.consolekit.policy b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/consolekit/org.freedesktop.consolekit.policy similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/consolekit/org.freedesktop.consolekit.policy rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/consolekit/org.freedesktop.consolekit.policy diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/ldap.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/ldap.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/undomain/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/undomain/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/undomain/ldap.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-auth/nss_ldap/undomain/ldap.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/create_hostonly b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/create_hostonly similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/create_hostonly rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/create_hostonly diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub.default b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub.default similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub.default rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub.default diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub.usbhdd b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub.usbhdd similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/default.grub.usbhdd rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/default.grub.usbhdd diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/menu.lst b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/menu.lst similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/menu.lst rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/menu.lst diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/update-grub b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/update-grub similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/update-grub rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/update-grub diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/update-grub.new b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/update-grub.new similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-boot/grub/update-grub.new rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-boot/grub/update-grub.new diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/prelink/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/prelink/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/prelink/conf.d/prelink b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-devel/prelink/conf.d/prelink rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/lvm2/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/lvm2/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/lvm2/lvm b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/lvm2/lvm rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/mdadm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/mdadm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/mdadm/mdadm b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/mdadm/mdadm rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/70-persistent-net.rules.remove b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules.remove similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/70-persistent-net.rules.remove rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules.remove diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/udev b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/udev similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-fs/udev/udev rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/udev/udev diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-power/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-power/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/80-upower-suspend.rules rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/org.freedesktop.upower.policy b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-power/upower-pm-utils/org.freedesktop.upower.policy rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-process/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-process/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-process/vixie-cron/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/vixie-cron/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-process/vixie-cron/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/vixie-cron/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/vixie-cron/calculate-update similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update rename to profiles/templates/3.3/3_ac_install_live/1-merge/sys-process/vixie-cron/calculate-update diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.default b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/X11/xorg.conf.default rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/conf.d/xdm b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-base/xorg-server/conf.d/xdm rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/light-locker/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/light-locker/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/light-locker/light-locker.desktop b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/light-locker/light-locker.desktop rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/slim/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/slim/.calculate_directory similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/slim/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/slim/.calculate_directory diff --git a/profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/slim/slim.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/slim/slim.conf similarity index 100% rename from profiles/templates/3.3/3_ac_install_live/1-live/x11-misc/slim/slim.conf rename to profiles/templates/3.3/3_ac_install_live/1-merge/x11-misc/slim/slim.conf diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostLogin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostLogin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostLogin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostLogin/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostLogin/Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostLogin/Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostLogin/Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostLogin/Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/00Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/00Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/00Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/00Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/05Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/05Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-2/PostSession/05Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-2/PostSession/05Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/00-user.desktop b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/00-user.desktop similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/00-user.desktop rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/00-user.desktop diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/00-calculate b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/00-calculate similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/00-calculate rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/00-calculate diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostLogin/Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostLogin/Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/00Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/00Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/00Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/00Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/05Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/05Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gdm-3/PostSession/05Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gdm-3/PostSession/05Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/gnome-shell.css b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/gnome-shell.css similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/gnome-shell.css rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/gnome-shell.css diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/loginDialog.js b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/loginDialog.js similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/loginDialog.js rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/loginDialog.js diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/screenShield.js b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/screenShield.js similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/gnome-base/gnome-shell/screenShield.js rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/gnome-base/gnome-shell/screenShield.js diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/kdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/kdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/kdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/kdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/kdm/kdmrc b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/kdm/kdmrc similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/kde-base/kdm/kdmrc rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/kde-base/kdm/kdmrc diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PostLogout b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PostLogout rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/Pre b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/Pre rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreLogin b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreLogin rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreReboot b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreReboot rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreShutdown b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/PreShutdown rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/pam-lxdm b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/lxde-base/lxdm/pam-lxdm rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/greeter.ui b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/greeter.ui similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/greeter.ui rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/greeter.ui diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/99lightdm b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/99lightdm similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/99lightdm rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/99lightdm diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/lightdm.conf b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/lightdm.conf similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/lightdm.conf rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/lightdm.conf diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/pam-lightdm b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/pam-lightdm similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/lightdm/pam-lightdm rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/lightdm/pam-lightdm diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/slim/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/slim/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/slim/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/slim/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/slim/slim.conf b/profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/slim/slim.conf similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/install/x11-misc/slim/slim.conf rename to profiles/templates/3.3/3_ac_install_live/3-desktop/install/x11-misc/slim/slim.conf diff --git a/profiles/templates/3.3/3_ac_install_live/3-desktop/remerge b/profiles/templates/3.3/3_ac_install_live/3-desktop/remerge new file mode 100644 index 000000000..95042dc4b --- /dev/null +++ b/profiles/templates/3.3/3_ac_install_live/3-desktop/remerge @@ -0,0 +1 @@ +# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[desktop])!=&&ini(merge-calculate.desktop)==||merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-desktop])!=&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostLogin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostLogin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostLogin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostLogin/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostLogin/Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostLogin/Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostLogin/Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostLogin/Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/00Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/00Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/00Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/00Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/05Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/05Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-2/PostSession/05Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-2/PostSession/05Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/00-user.desktop b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/00-user.desktop similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/00-user.desktop rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/00-user.desktop diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/00-calculate b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/00-calculate similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/00-calculate rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/00-calculate diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostLogin/Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostLogin/Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/00Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/00Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/00Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/00Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/05Default b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/05Default similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/gnome-base/gdm-3/PostSession/05Default rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/gnome-base/gdm-3/PostSession/05Default diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/kdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/kdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/kdm/kdmrc b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/kdmrc similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/kde-base/kdm/kdmrc rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/kdmrc diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lightdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lightdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lightdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lightdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lightdm/lightdm.conf b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lightdm/lightdm.conf similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lightdm/lightdm.conf rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lightdm/lightdm.conf diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PostLogout b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PostLogout rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreLogin b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreLogin rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreReboot b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreReboot rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreShutdown b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/lxde-base/lxdm/PreShutdown rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown diff --git a/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory new file mode 100644 index 000000000..720d52e47 --- /dev/null +++ b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/slim/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/.calculate_directory similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/slim/.calculate_directory rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/.calculate_directory diff --git a/profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/slim/slim.conf b/profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/slim.conf similarity index 100% rename from profiles/templates/3.3/4_ac_desktop_merge/uninstall/x11-misc/slim/slim.conf rename to profiles/templates/3.3/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/slim.conf diff --git a/profiles/templates/3.3/4_ac_desktop_merge/.calculate_directory b/profiles/templates/3.3/4_ac_desktop_merge/.calculate_directory deleted file mode 100644 index 73b6759e0..000000000 --- a/profiles/templates/3.3/4_ac_desktop_merge/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip env=desktop ac_desktop_merge==on diff --git a/profiles/templates/3.3/4_ac_desktop_merge/README-eng.txt b/profiles/templates/3.3/4_ac_desktop_merge/README-eng.txt deleted file mode 100644 index 0815026ce..000000000 --- a/profiles/templates/3.3/4_ac_desktop_merge/README-eng.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate append=skip - -The ac_desktop_merge event: -- package installation (not chroot*) -- package removal (not chroot) -- system setup -- first boot - - -*The event will not be used while the system is being built or if the package -is being installed in builder mode. - -Action: package configuration -env: desktop diff --git a/profiles/templates/3.3/4_ac_desktop_merge/README-rus.txt b/profiles/templates/3.3/4_ac_desktop_merge/README-rus.txt deleted file mode 100644 index 019fdf1f2..000000000 --- a/profiles/templates/3.3/4_ac_desktop_merge/README-rus.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate append=skip - -Событие ac_desktop_merge: -- установка пакета (не chroot*) -- удаление пакета (не chroot) -- настройка системы -- первая загрузка - -*Событие не будет использоваться во время сборки системы или установке пакета -в builder-режиме. - -Действие: настройка пакета -env: desktop \ No newline at end of file diff --git a/profiles/templates/3.3/4_ac_desktop_merge/reconfigure b/profiles/templates/3.3/4_ac_desktop_merge/reconfigure deleted file mode 100644 index c98a167c8..000000000 --- a/profiles/templates/3.3/4_ac_desktop_merge/reconfigure +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm diff --git a/profiles/templates/3.3/5_ac_client_undomain/.calculate_directory b/profiles/templates/3.3/5_ac_client_undomain/.calculate_directory index a60d1a689..6d289f1a3 100644 --- a/profiles/templates/3.3/5_ac_client_undomain/.calculate_directory +++ b/profiles/templates/3.3/5_ac_client_undomain/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip env=client pkg(sys-apps/calculate-utils[client])!=&&ac_client_undomain==on +# Calculate append=skip ini(merge-calculate.client-undomain)==yes||merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-client])!=&&ini(merge-calculate.client)!=||pkg(sys-apps/calculate-utils[client])!=&&client.ac_client_undomain==on merge=x11-base/xorg-server diff --git a/profiles/templates/3.3/5_ac_client_undomain/0-undomain b/profiles/templates/3.3/5_ac_client_undomain/0-undomain new file mode 100644 index 000000000..c28def9ab --- /dev/null +++ b/profiles/templates/3.3/5_ac_client_undomain/0-undomain @@ -0,0 +1,4 @@ +# Calculate path=/etc/calculate name=ini.env format=samba ini(merge-calculate.client-undomain)==yes + +[merge-calculate] +!client-undomain = diff --git a/profiles/templates/3.3/5_ac_client_undomain/1-remerge b/profiles/templates/3.3/5_ac_client_undomain/1-remerge new file mode 100644 index 000000000..2dfe142c9 --- /dev/null +++ b/profiles/templates/3.3/5_ac_client_undomain/1-remerge @@ -0,0 +1,4 @@ +# Calculate path=/etc/calculate name=ini.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-client])!=&&ini(merge-calculate.client)!= merge=gnome-base/gdm,gnome-base/gdm-3,kde-base/kdm,net-misc/openssh,sys-apps/sysvinit,sys-auth/nss_ldap,sys-auth/pambase,sys-libs/glibc + +[merge-calculate] +client-undomain = yes diff --git a/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/.calculate_directory b/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/.calculate_directory deleted file mode 100644 index 11417ee9d..000000000 --- a/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!= name=etc append=skip diff --git a/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/reconfigurePackages b/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/reconfigurePackages deleted file mode 100644 index e6fdfdccc..000000000 --- a/profiles/templates/3.3/5_ac_client_undomain/sys-apps/calculate-client/reconfigurePackages +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate path=/tmp pkg(x11-base/xorg-server)!=&&os_root_type==livecd name=reconfigureXorg exec=/bin/bash - -# reconfigure conf.d/xdm after undomain action on livecd - -cl-core --method core_setup --pkg-name=xorg-server &>/dev/null - -true diff --git a/profiles/templates/3.3/5_ac_client_undomain/sys-libs/glibc/nscd.stop b/profiles/templates/3.3/5_ac_client_undomain/sys-libs/glibc/nscd.stop index dea2110ff..360cb90d0 100644 --- a/profiles/templates/3.3/5_ac_client_undomain/sys-libs/glibc/nscd.stop +++ b/profiles/templates/3.3/5_ac_client_undomain/sys-libs/glibc/nscd.stop @@ -3,7 +3,7 @@ #?cl_system_boot_set==off# (/etc/init.d/nscd status && /etc/init.d/nscd stop ) &>/dev/null #cl_system_boot_set# -#?cl_system_boot_set==on&&client.cl_remote_host!=# +#?cl_system_boot_set==on&&env(client.cl_remote_host)!=# pidfile="/var/run/nscd/nscd.pid" [[ -f $pidfile ]] && start-stop-daemon --stop --quiet \ --exec /usr/sbin/nscd --pidfile ${pidfile} &>/dev/null diff --git a/profiles/templates/3.3/9_ac_install_merge/.calculate_directory b/profiles/templates/3.3/9_ac_install_merge/.calculate_directory new file mode 100644 index 000000000..6aa20846c --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip env=install ac_install_merge==on diff --git a/profiles/templates/3.3/9_ac_install_merge/README-eng.txt b/profiles/templates/3.3/9_ac_install_merge/README-eng.txt new file mode 100644 index 000000000..92d938fcb --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/README-eng.txt @@ -0,0 +1,13 @@ +# Calculate append=skip + +The ac_install_merge event: +- package installation +- package removal +- system setup* +- system installation +- Portages syncing + +*When cl-setup-system is run with the defaul '--live=off' option. + +Action: package configuration +env: install diff --git a/profiles/templates/3.3/9_ac_install_merge/README-rus.txt b/profiles/templates/3.3/9_ac_install_merge/README-rus.txt new file mode 100644 index 000000000..d1af3c74a --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/README-rus.txt @@ -0,0 +1,13 @@ +# Calculate append=skip + +Событие ac_install_merge: +- установка пакета +- удаление пакета +- настройка системы* +- установка системы +- обновление портежей + +*При выполнении команды cl-setup-system со значением по умолчанию '--live=off'. + +Действие: настройка пакета +env: install \ No newline at end of file diff --git a/profiles/templates/3.3/9_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/3.3/9_ac_install_merge/sys-apps/.calculate_directory new file mode 100644 index 000000000..720d52e47 --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/sys-apps/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory new file mode 100644 index 000000000..86c94d1d5 --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory @@ -0,0 +1 @@ +# Calculate merge()!=&&pkg()!= path=/etc name=calculate diff --git a/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/ini.env b/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/ini.env new file mode 100644 index 000000000..730a598ca --- /dev/null +++ b/profiles/templates/3.3/9_ac_install_merge/sys-apps/calculate-utils/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[merge-calculate] +utils = #-pkg(sys-apps/calculate-utils)-# +desktop = #-pkg(sys-apps/calculate-utils[desktop])-# +client = #-pkg(sys-apps/calculate-utils[client])-# +qt4 = #-pkg(sys-apps/calculate-utils[qt4])-#