From 757d4d4e160490614ab7fd7d6ded5c72ed765dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Sun, 19 May 2013 13:53:25 +0400 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=20xdm=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=20=D0=B2=20merge,=20preload=20boot->default.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x11-base/xorg-server/boot/.calculate_directory | 0 .../x11-base/xorg-server/boot/xdm | 0 .../x11-base/xorg-server/boot/xdm.del | 0 .../x11-base/xorg-server/default/.calculate_directory | 0 .../x11-base/xorg-server/default/xdm.del | 0 .../3_ac_install_live/1-live/sys-apps/preload/boot/preload | 2 +- .../1-live/sys-apps/preload/default/.calculate_directory | 2 ++ .../1-live/sys-apps/preload/default/preload | 1 + profiles/templates/3.1/6_ac_update_sync/revision/21 | 5 +++++ 9 files changed, 9 insertions(+), 1 deletion(-) rename profiles/templates/3.1/{3_ac_install_live/1-live => 2_ac_install_merge}/x11-base/xorg-server/boot/.calculate_directory (100%) rename profiles/templates/3.1/{3_ac_install_live/1-live => 2_ac_install_merge}/x11-base/xorg-server/boot/xdm (100%) rename profiles/templates/3.1/{3_ac_install_live/1-live => 2_ac_install_merge}/x11-base/xorg-server/boot/xdm.del (100%) rename profiles/templates/3.1/{3_ac_install_live/1-live => 2_ac_install_merge}/x11-base/xorg-server/default/.calculate_directory (100%) rename profiles/templates/3.1/{3_ac_install_live/1-live => 2_ac_install_merge}/x11-base/xorg-server/default/xdm.del (100%) create mode 100644 profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory create mode 100644 profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload create mode 100644 profiles/templates/3.1/6_ac_update_sync/revision/21 diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory similarity index 100% rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/.calculate_directory rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm similarity index 100% rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm.del b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del similarity index 100% rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm.del rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory similarity index 100% rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/.calculate_directory rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/xdm.del b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/xdm.del similarity index 100% rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/xdm.del rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/xdm.del diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload index 90019111b..8afb1e88b 100644 --- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload +++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload @@ -1 +1 @@ -# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd +# Calculate append=remove diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory new file mode 100644 index 000000000..0f7257bce --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate path=/etc/runlevels + diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload new file mode 100644 index 000000000..90019111b --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload @@ -0,0 +1 @@ +# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd diff --git a/profiles/templates/3.1/6_ac_update_sync/revision/21 b/profiles/templates/3.1/6_ac_update_sync/revision/21 new file mode 100644 index 000000000..656d15a42 --- /dev/null +++ b/profiles/templates/3.1/6_ac_update_sync/revision/21 @@ -0,0 +1,5 @@ +# Calculate ini(update.rev)<21 format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server,sys-auth/nss_ldap,sys-apps/prelink + +# update rules +[update] +rev = 21