diff --git a/merge/README.txt b/merge/README.txt index 28d8727..75f59c2 100644 --- a/merge/README.txt +++ b/merge/README.txt @@ -22,6 +22,7 @@ app-portage/porthole Удалены шаблоны net-im/riot-web - патчи устарели, пакет переименовался Удалены шаблоны net-im/skype - пакет полностью другой Удалены шаблоны sys-auth/consolekit - так как пакет устрел и отсутствует в portage +Удалены шаблоны sys-process/vixie-cron - так как пакет устрел и отсутствует в portage При переносе шаблонов app-office/libreoffice удалены шаблоны для x86 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии diff --git a/merge/sys-process/.calculate_directory b/merge/sys-process/.calculate_directory new file mode 100644 index 0000000..fe9987a --- /dev/null +++ b/merge/sys-process/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip' %} diff --git a/merge/sys-process/cronie/.calculate_directory b/merge/sys-process/cronie/.calculate_directory new file mode 100644 index 0000000..d45c22d --- /dev/null +++ b/merge/sys-process/cronie/.calculate_directory @@ -0,0 +1 @@ +{% calculate name='etc', package='sys-process/cronie' %} diff --git a/merge/sys-process/cronie/cronie-migrate b/merge/sys-process/cronie/cronie-migrate new file mode 100644 index 0000000..fef61ac --- /dev/null +++ b/merge/sys-process/cronie/cronie-migrate @@ -0,0 +1,29 @@ +{% calculate run='/bin/bash', pkg('sys-process/vixie-cron')!= %} +# Шаблон миграции с vixie-cron на cronie +# Если пользователь не менял основной файл /etc/crontab, то замещает его на +# новый от cronie +# Завершает процесс vixie-cron и запускает службу cronie + +origcrontab=/etc/crontab +cfgcrontab1=/etc/._cfg0000_crontab +cfgcrontab2=/etc/._cfg0001_crontab + +origmd5sum="b4c104b60b829977a8898a9102cf5a79" + +md5sumcrontab_current() { + grep -v -e "^#" -e "^$" /etc/crontab | sed -r 's/ +$//' | md5sum | awk '{ print $1 }' +} + +crontab_changed() { + [[ "$(md5sumcrontab_current)" != "$origmd5sum" ]] +} + +if [[ -f $cfgcrontab1 ]] && ! [[ -f $cfgcrontab2 ]] && ! crontab_changed +then + mv $cfgcrontab1 $origcrontab +elif crontab_changed +then + echo "Need to update /etc/crontab for correct work of cronie" 1>&2 + echo "and reconfigure cronie by command:" 1>&2 + echo " cl-core-setup --pkg-name cronie" 1>&2 +fi diff --git a/merge/sys-process/cronie/default/.calculate_directory b/merge/sys-process/cronie/default/.calculate_directory new file mode 100644 index 0000000..3e91c01 --- /dev/null +++ b/merge/sys-process/cronie/default/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc/runlevels' %} diff --git a/merge/sys-process/cronie/default/cronie b/merge/sys-process/cronie/default/cronie new file mode 100644 index 0000000..b4c8f65 --- /dev/null +++ b/merge/sys-process/cronie/default/cronie @@ -0,0 +1,2 @@ +{% calculate append="link", source="/etc/init.d/cronie", custom.runlevels.cronie != 'on' or grep('var/lib/calculate/-runlevels-cronie','/cronie') %} +{% save.system custom.runlevels.cronie = "on" %} diff --git a/merge/sys-process/htop/.calculate_directory b/merge/sys-process/htop/.calculate_directory new file mode 100644 index 0000000..9ddd042 --- /dev/null +++ b/merge/sys-process/htop/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share', name='applications', package='sys-process/htop' %} diff --git a/merge/sys-process/htop/htop.desktop b/merge/sys-process/htop/htop.desktop new file mode 100644 index 0000000..da0c0ff --- /dev/null +++ b/merge/sys-process/htop/htop.desktop @@ -0,0 +1,4 @@ +{% calculate format='kde' %} + +[Desktop Entry] +NoDisplay=true