From e4bb84af2703a8f8bf6575114eeb39ed7e8dfde3 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 14 Apr 2015 18:12:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media-sound/alsa-utils/default/alsasound | 2 +- .../3.3/2_ac_install_merge/net-print/cups/default/cupsd | 2 +- .../sys-apps/calculate-utils/calculate-core-default | 2 +- .../templates/3.3/2_ac_install_merge/sys-apps/dbus/boot/dbus | 2 +- .../sys-apps/openrc/boot.runlevels/consolefont | 2 +- .../3_ac_install_live/1-merge/net-misc/openssh/default/sshd | 2 +- .../3_ac_install_live/1-merge/net-wireless/bluez/bluetooth | 2 +- .../1-merge/sys-apps/openrc/default.runlevels/numlock | 2 +- .../1-merge/sys-apps/preload/default/preload | 2 +- .../templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm | 2 +- .../3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm | 2 +- .../sys-apps/calculate-install/runlevels/default/laptopd | 2 +- .../sys-apps/calculate-install/runlevels/default/laptopd | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/{39 => 46} | 4 ++-- profiles/templates/3.3/6_ac_update_sync/remerge/{40 => 47} | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) rename profiles/templates/3.3/6_ac_update_sync/remerge/{39 => 46} (89%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{40 => 47} (82%) diff --git a/profiles/templates/3.3/2_ac_install_merge/media-sound/alsa-utils/default/alsasound b/profiles/templates/3.3/2_ac_install_merge/media-sound/alsa-utils/default/alsasound index bf0122ba8..7ee11e03e 100644 --- a/profiles/templates/3.3/2_ac_install_merge/media-sound/alsa-utils/default/alsasound +++ b/profiles/templates/3.3/2_ac_install_merge/media-sound/alsa-utils/default/alsasound @@ -1 +1 @@ -# Calculate link=/etc/init.d/alsasound symbolic ini(runlevels.alsa-utils)!=on&&ini(runlevels.alsa-utils,on)==||grep(/var/log/calculate/-runlevels-alsa-utils,/alsasound)!= +# Calculate link=/etc/init.d/alsasound symbolic ini(runlevels.alsa-utils)!=on&&ini(runlevels.alsa-utils,on)==||grep(/var/lib/calculate/-runlevels-alsa-utils,/alsasound)!= diff --git a/profiles/templates/3.3/2_ac_install_merge/net-print/cups/default/cupsd b/profiles/templates/3.3/2_ac_install_merge/net-print/cups/default/cupsd index a471cc182..ef316ffaa 100644 --- a/profiles/templates/3.3/2_ac_install_merge/net-print/cups/default/cupsd +++ b/profiles/templates/3.3/2_ac_install_merge/net-print/cups/default/cupsd @@ -1 +1 @@ -# Calculate link=/etc/init.d/cupsd symbolic ini(runlevels.cups)!=on&&ini(runlevels.cups,on)==||grep(/var/log/calculate/-runlevels-cups,/cupsd)!= +# Calculate link=/etc/init.d/cupsd symbolic ini(runlevels.cups)!=on&&ini(runlevels.cups,on)==||grep(/var/lib/calculate/-runlevels-cups,/cupsd)!= diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default b/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default index 67b14dd83..e4675814d 100644 --- a/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default +++ b/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default @@ -1 +1 @@ -# Calculate link=/etc/init.d/calculate-core path=/etc/runlevels/default name=calculate-core symbolic ini(runlevels.calculate-utils/calculate-core)!=on&&ini(runlevels.calculate-utils/calculate-core,on)==||grep(/var/log/calculate/-runlevels-calculate-utils,/calculate-core)!= +# Calculate link=/etc/init.d/calculate-core path=/etc/runlevels/default name=calculate-core symbolic ini(runlevels.calculate-utils/calculate-core)!=on&&ini(runlevels.calculate-utils/calculate-core,on)==||grep(/var/lib/calculate/-runlevels-calculate-utils,/calculate-core)!= diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-apps/dbus/boot/dbus b/profiles/templates/3.3/2_ac_install_merge/sys-apps/dbus/boot/dbus index 7efd6acca..74fc216bb 100644 --- a/profiles/templates/3.3/2_ac_install_merge/sys-apps/dbus/boot/dbus +++ b/profiles/templates/3.3/2_ac_install_merge/sys-apps/dbus/boot/dbus @@ -1 +1 @@ -# Calculate link=/etc/init.d/dbus symbolic ini(runlevels.dbus)!=on&&ini(runlevels.dbus,on)==||grep(/var/log/calculate/-runlevels-dbus,/dbus)!= +# Calculate link=/etc/init.d/dbus symbolic ini(runlevels.dbus)!=on&&ini(runlevels.dbus,on)==||grep(/var/lib/calculate/-runlevels-dbus,/dbus)!= diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont b/profiles/templates/3.3/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont index 0120aa7e4..c4ebbe9ad 100644 --- a/profiles/templates/3.3/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont +++ b/profiles/templates/3.3/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont @@ -1 +1 @@ -# Calculate link=/etc/init.d/consolefont symbolic ini(runlevels.openrc/consolefont)!=on&&ini(runlevels.openrc/consolefont,on)==||grep(/var/log/calculate/-runlevels-openrc,/consolefont)!= +# Calculate link=/etc/init.d/consolefont symbolic ini(runlevels.openrc/consolefont)!=on&&ini(runlevels.openrc/consolefont,on)==||grep(/var/lib/calculate/-runlevels-openrc,/consolefont)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd index 4ec4fec55..6ba87fddd 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/net-misc/openssh/default/sshd @@ -1 +1 @@ -# Calculate link=/etc/init.d/sshd symbolic ini(runlevels.openssh)!=on&&ini(runlevels.openssh,on)==||grep(/var/log/calculate/-runlevels-openssh,/sshd)!= +# Calculate link=/etc/init.d/sshd symbolic ini(runlevels.openssh)!=on&&ini(runlevels.openssh,on)==||grep(/var/lib/calculate/-runlevels-openssh,/sshd)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth index 6a1063c20..39eda8e0f 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth @@ -1 +1 @@ -# Calculate link=/etc/init.d/bluetooth symbolic path=/etc/runlevels/default ini(runlevels.bluez)!=on&&ini(runlevels.bluez,on)==||grep(/var/log/calculate/-runlevels-bluez,/bluetooth)!= +# Calculate link=/etc/init.d/bluetooth symbolic path=/etc/runlevels/default ini(runlevels.bluez)!=on&&ini(runlevels.bluez,on)==||grep(/var/lib/calculate/-runlevels-bluez,/bluetooth)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock index e46f0f346..d6a5066c7 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock @@ -1 +1 @@ -# Calculate link=/etc/init.d/numlock symbolic hr_laptop== ini(runlevels.openrc/numlock)!=on&&ini(runlevels.openrc/numlock,on)==||grep(/var/log/calculate/-runlevels-openrc,/numlock)!= +# Calculate link=/etc/init.d/numlock symbolic hr_laptop== ini(runlevels.openrc/numlock)!=on&&ini(runlevels.openrc/numlock,on)==||grep(/var/lib/calculate/-runlevels-openrc,/numlock)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload index 79456de2a..98713364f 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-apps/preload/default/preload @@ -1 +1 @@ -# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd ini(runlevels.preload)!=on&&ini(runlevels.preload,on)==||grep(/var/log/calculate/-runlevels-preload,/preload)!= +# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd ini(runlevels.preload)!=on&&ini(runlevels.preload,on)==||grep(/var/lib/calculate/-runlevels-preload,/preload)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm index a3079e036..48533dbc5 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/lvm2/lvm @@ -1 +1 @@ -# Calculate os_install_lvm_set==on link=/etc/init.d/lvm symbolic ini(runlevels.lvm2)!=on&&ini(runlevels.lvm2,on)==||grep(/var/log/calculate/-runlevels-lvm2,/lvm)!= +# Calculate os_install_lvm_set==on link=/etc/init.d/lvm symbolic ini(runlevels.lvm2)!=on&&ini(runlevels.lvm2,on)==||grep(/var/lib/calculate/-runlevels-lvm2,/lvm)!= diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm index c2955e47f..8e38ba9f8 100644 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm @@ -1 +1 @@ -# Calculate os_install_mdadm_set==on link=/etc/init.d/mdadm symbolic ini(runlevels.mdadm)!=on&&ini(runlevels.mdadm,on)==||grep(/var/log/calculate/-runlevels-mdadm,/mdadm)!= +# Calculate os_install_mdadm_set==on link=/etc/init.d/mdadm symbolic ini(runlevels.mdadm)!=on&&ini(runlevels.mdadm,on)==||grep(/var/lib/calculate/-runlevels-mdadm,/mdadm)!= diff --git a/profiles/templates/3.3/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd b/profiles/templates/3.3/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd index f83b24dbc..5d76e4f51 100644 --- a/profiles/templates/3.3/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd +++ b/profiles/templates/3.3/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd @@ -1 +1 @@ -# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/log/calculate/-runlevels-calculate-utils,/laptopd)!= +# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/lib/calculate/-runlevels-calculate-utils,/laptopd)!= diff --git a/profiles/templates/3.3/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd b/profiles/templates/3.3/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd index f83b24dbc..5d76e4f51 100644 --- a/profiles/templates/3.3/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd +++ b/profiles/templates/3.3/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd @@ -1 +1 @@ -# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/log/calculate/-runlevels-calculate-utils,/laptopd)!= +# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/lib/calculate/-runlevels-calculate-utils,/laptopd)!= diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index f8ca576b2..dc4769519 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 43 +remerge = 46 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/39 b/profiles/templates/3.3/6_ac_update_sync/remerge/46 similarity index 89% rename from profiles/templates/3.3/6_ac_update_sync/remerge/39 rename to profiles/templates/3.3/6_ac_update_sync/remerge/46 index 783e17037..4f83c4684 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/39 +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/46 @@ -1,7 +1,7 @@ -# Calculate format=samba path=/etc/calculate name=ini.env ini(overlay-calculate.remerge)<39 +# Calculate format=samba path=/etc/calculate name=ini.env ini(overlay-calculate.remerge)<46 [overlay-calculate] -remerge = 39 +remerge = 46 [runlevels] !syslog-ng = diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/40 b/profiles/templates/3.3/6_ac_update_sync/remerge/47 similarity index 82% rename from profiles/templates/3.3/6_ac_update_sync/remerge/40 rename to profiles/templates/3.3/6_ac_update_sync/remerge/47 index 75b6aecf5..2742bd410 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/40 +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/47 @@ -1,4 +1,4 @@ -# Calculate format=samba path=/etc/calculate name=ini.env merge=app-admin/syslog-ng,media-gfx/splashutils,media-sound/alsa-utils,net-wireless/bluez,net-misc/openssh,net-print/cups,sys-apps/calculate-utils,sys-apps/dbus,sys-apps/openrc,sys-apps/preload,sys-auth/consolekit,sys-fs/eudev,sys-fs/lvm2,sys-fs/mdadm,sys-fs/udev,sys-process/vixie-cron ini(overlay-calculate.remerge)<40 +# Calculate format=samba path=/etc/calculate name=ini.env merge=app-admin/syslog-ng,media-gfx/splashutils,media-sound/alsa-utils,net-wireless/bluez,net-misc/openssh,net-print/cups,sys-apps/calculate-utils,sys-apps/dbus,sys-apps/openrc,sys-apps/preload,sys-auth/consolekit,sys-fs/eudev,sys-fs/lvm2,sys-fs/mdadm,sys-fs/udev,sys-process/vixie-cron ini(overlay-calculate.remerge)<47 [overlay-calculate] -remerge = 40 +remerge = 47