Исправлена настройка служб в автозагрузке

profiles/templates/3.3/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng

@@ -1 +1 @@
-# Calculate link=/etc/init.d/syslog-ng symbolic ini(runlevels.syslog-ng)!=on&&ini(runlevels.syslog-ng,on)==
+# Calculate link=/etc/init.d/syslog-ng symbolic ini(runlevels.syslog-ng)!=on&&ini(runlevels.syslog-ng,on)==||grep(/var/lib/calculate/-runlevels-syslog-ng,/syslog-ng)!=

profiles/templates/3.3/2_ac_install_merge/media-gfx/splashutils/default/fbcondecor

@@ -1 +1 @@
-# Calculate link=/etc/init.d/fbcondecor symbolic ini(runlevels.splashutils)!=on&&ini(runlevels.splashutils,on)==
+# Calculate link=/etc/init.d/fbcondecor symbolic ini(runlevels.splashutils)!=on&&ini(runlevels.splashutils,on)==||grep(/var/lib/calculate/-runlevels-splashutils,/fbcondecor)!=

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)==
+# 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)!=

profiles/templates/3.3/2_ac_install_merge/net-nds/portmap/default/portmap

@@ -1 +1 @@
-# Calculate link=/etc/init.d/portmap symbolic ini(runlevels.portmap)!=on&&ini(runlevels.portmap,on)==
+# Calculate link=/etc/init.d/portmap symbolic ini(runlevels.portmap)!=on&&ini(runlevels.portmap,on)==||grep(/var/lib/calculate/-runlevels-portmap,/portmap)!=

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)==
+# Calculate link=/etc/init.d/cupsd symbolic ini(runlevels.cups)!=on&&ini(runlevels.cups,on)==||grep(/var/log/calculate/-runlevels-cups,/cupsd)!=

profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package

@@ -32,6 +32,11 @@ mark_update_package() {
 	touch "/var/lib/calculate/-merge-$PN--${SLOT/\//_}-$PPID"
 }
 
+# save services runlevels
+save_runlevels() {
+	find /etc/runlevels/{default,boot} >/var/lib/calculate/-runlevels-$PN
+}
+
 # dispatching unmerge or update package
 pkg_postrm_dispatch() {
 	if [[ ! -f /var/lib/calculate/-merge-$PN--${SLOT/\//_}-$PPID ]]
@@ -65,4 +70,5 @@ pre_pkg_postinst() {
 
 pre_pkg_preinst() {
 	mark_update_package
+	save_runlevels
 }

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)==
+# 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)!=

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)==
+# Calculate link=/etc/init.d/dbus symbolic ini(runlevels.dbus)!=on&&ini(runlevels.dbus,on)==||grep(/var/log/calculate/-runlevels-dbus,/dbus)!=

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)==
+# Calculate link=/etc/init.d/consolefont symbolic ini(runlevels.openrc/consolefont)!=on&&ini(runlevels.openrc/consolefont,on)==||grep(/var/log/calculate/-runlevels-openrc,/consolefont)!=

profiles/templates/3.3/2_ac_install_merge/sys-auth/consolekit/boot/consolekit

@@ -1 +1 @@
-# Calculate link=/etc/init.d/consolekit symbolic ini(runlevels.consolekit)!=on&&ini(runlevels.consolekit,on)==
+# Calculate link=/etc/init.d/consolekit symbolic ini(runlevels.consolekit)!=on&&ini(runlevels.consolekit,on)==||grep(/var/lib/calculate/-runlevels-consolekit,/consolekit)!=

profiles/templates/3.3/2_ac_install_merge/sys-fs/eudev/sysinit/udev

@@ -1 +1 @@
-# Calculate link=/etc/init.d/udev symbolic ini(runlevels.eudev)!=on&&ini(runlevels.eudev,on)==
+# Calculate link=/etc/init.d/udev symbolic ini(runlevels.eudev)!=on&&ini(runlevels.eudev,on)==||grep(/var/lib/calculate/-runlevels-eudev,/udev)!=

profiles/templates/3.3/2_ac_install_merge/sys-fs/udev/sysinit/udev

@@ -1 +1 @@
-# Calculate link=/etc/init.d/udev symbolic ini(runlevels.udev)!=on&&ini(runlevels.udev,on)==
+# Calculate link=/etc/init.d/udev symbolic ini(runlevels.udev)!=on&&ini(runlevels.udev,on)==||grep(/var/lib/calculate/-runlevels-udev,/udev)!=

profiles/templates/3.3/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron

@@ -1 +1 @@
-# Calculate link=/etc/init.d/vixie-cron symbolic ini(runlevels.vixie-cron)!=on&&ini(runlevels.vixie-cron,on)==
+# Calculate link=/etc/init.d/vixie-cron symbolic ini(runlevels.vixie-cron)!=on&&ini(runlevels.vixie-cron,on)==||grep(/var/lib/calculate/-runlevels-vixie-cron,vixie-cron)!=

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)==
+# Calculate link=/etc/init.d/sshd symbolic ini(runlevels.openssh)!=on&&ini(runlevels.openssh,on)==||grep(/var/log/calculate/-runlevels-openssh,/sshd)!=

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)==
+# 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)!=

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)==
+# 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)!=

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)==
+# 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)!=

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)==
+# 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)!=

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)==
+# 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)!=

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)==
+# 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)!=

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)==
+# 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)!=

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 = 38
+remerge = 39

profiles/templates/3.3/6_ac_update_sync/remerge/39.1

@@ -0,0 +1,3 @@
+# Calculate format=samba path=/etc/calculate name=ini.env ini(overlay-calculate.remerge)<39
+
+[!runlevels]

profiles/templates/3.3/6_ac_update_sync/remerge/39.2

@@ -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)<38
+# 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)<39
 
 [overlay-calculate]
-remerge = 38
+remerge = 39