Accepting request 830854 from home:kstreitova:branches:Base:System

- Use the new value of %_libexecdir macro (/usr/lib -> /usr/libexec)
  in crontab and other occurences: [bsc#1175934]
  * cronie-anacron-1.4.7-run-crons.patch
  * run-crons
  * sample.root
  * sysconfig.cron

OBS-URL: https://build.opensuse.org/request/show/830854
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=191
This commit is contained in:
Kristyna Streitova 2020-08-31 14:46:14 +00:00 committed by Git OBS Bridge
parent 00d529affa
commit db4b3ee70b
5 changed files with 26 additions and 16 deletions

View File

@ -1,7 +1,7 @@
Index: cronie-1.4.7/contrib/anacrontab
Index: cronie-cronie-1.5.5/contrib/anacrontab
===================================================================
--- cronie-1.4.7.orig/contrib/anacrontab
+++ cronie-1.4.7/contrib/anacrontab
--- cronie-cronie-1.5.5.orig/contrib/anacrontab
+++ cronie-cronie-1.5.5/contrib/anacrontab
@@ -11,6 +11,6 @@ RANDOM_DELAY=45
START_HOURS_RANGE=3-22
@ -9,23 +9,23 @@ Index: cronie-1.4.7/contrib/anacrontab
-1 5 cron.daily nice run-parts /etc/cron.daily
-7 25 cron.weekly nice run-parts /etc/cron.weekly
-@monthly 45 cron.monthly nice run-parts /etc/cron.monthly
+1 5 cron.daily nice /usr/lib/cron/run-crons /etc/cron.daily
+7 25 cron.weekly nice /usr/lib/cron/run-crons /etc/cron.weekly
+@monthly 45 cron.monthly nice /usr/lib/cron/run-crons /etc/cron.monthly
Index: cronie-1.4.7/man/anacrontab.5
+1 5 cron.daily nice /usr/libexec/cron/run-crons /etc/cron.daily
+7 25 cron.weekly nice /usr/libexec/cron/run-crons /etc/cron.weekly
+@monthly 45 cron.monthly nice /usr/libexec/cron/run-crons /etc/cron.monthly
Index: cronie-cronie-1.5.5/man/anacrontab.5
===================================================================
--- cronie-1.4.7.orig/man/anacrontab.5
+++ cronie-1.4.7/man/anacrontab.5
@@ -79,9 +79,9 @@ RANDOM_DELAY=30
--- cronie-cronie-1.5.5.orig/man/anacrontab.5
+++ cronie-cronie-1.5.5/man/anacrontab.5
@@ -97,9 +97,9 @@ RANDOM_DELAY=30
# Anacron jobs will start between 6am and 8am.
START_HOURS_RANGE=6-8
# delay will be 5 minutes + RANDOM_DELAY for cron.daily
-1 5 cron.daily nice run-parts /etc/cron.daily
-7 0 cron.weekly nice run-parts /etc/cron.weekly
-@monthly 0 cron.monthly nice run-parts /etc/cron.monthly
+1 5 cron.daily nice /usr/lib/cron/run-crons /etc/cron.daily
+7 0 cron.weekly nice /usr/lib/cron/run-crons /etc/cron.weekly
+@monthly 0 cron.monthly nice /usr/lib/cron/run-crons /etc/cron.monthly
+1 5 cron.daily nice /usr/libexec/cron/run-crons /etc/cron.daily
+7 0 cron.weekly nice /usr/libexec/cron/run-crons /etc/cron.weekly
+@monthly 0 cron.monthly nice /usr/libexec/cron/run-crons /etc/cron.monthly
.fi
.SH "SEE ALSO"
.BR anacron (8),

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 31 14:25:09 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
- Use the new value of %_libexecdir macro (/usr/lib -> /usr/libexec)
in crontab and other occurences: [bsc#1175934]
* cronie-anacron-1.4.7-run-crons.patch
* run-crons
* sample.root
* sysconfig.cron
-------------------------------------------------------------------
Tue Jun 23 10:38:53 UTC 2020 - Ismail Dönmez <idonmez@suse.com>

View File

@ -1,6 +1,6 @@
#!/bin/bash
#
# /usr/lib/cron/run-crons
# /usr/libexec/cron/run-crons
#
# Copyright (c) 1998-2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
#

View File

@ -12,5 +12,5 @@ MAILTO=root
# | | | | .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat
# | | | | |
# * * * * * user-name command to be executed
-*/15 * * * * root test -x /usr/lib/cron/run-crons && /usr/lib/cron/run-crons >/dev/null 2>&1
-*/15 * * * * root test -x /usr/libexec/cron/run-crons && /usr/libexec/cron/run-crons >/dev/null 2>&1

View File

@ -22,7 +22,7 @@ DAILY_TIME=""
# 0 to skip this. This is for users who will power off their system.
#
# There is a fixed max. of 14 days set, if you want to override this
# change MAX_NOT_RUN_FORCE in /usr/lib/cron/run-crons
# change MAX_NOT_RUN_FORCE in /usr/libexec/cron/run-crons
MAX_NOT_RUN="5"
## Type: yesno