From 6cfe77a95e95f27ab9c08f61081b3200046d6460dbb34be8b568f3b4b64762c5 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 21 Aug 2014 13:02:12 +0000 Subject: [PATCH] - adjust initscript check to match new systemctl based %restart_on_update resp %stop_on_removal OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=289 --- rpmlint.changes | 6 ++++++ sysv5-init-checks.diff | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rpmlint.changes b/rpmlint.changes index 8b51872..2ebefa2 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 21 12:53:31 UTC 2014 - lnussel@suse.de + +- adjust initscript check to match new systemctl based + %restart_on_update resp %stop_on_removal + ------------------------------------------------------------------- Mon Jul 21 11:40:15 UTC 2014 - werner@suse.de diff --git a/sysv5-init-checks.diff b/sysv5-init-checks.diff index 31252de..04f1f11 100644 --- a/sysv5-init-checks.diff +++ b/sysv5-init-checks.diff @@ -6,8 +6,8 @@ Index: InitScriptCheck.py lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$') use_subsys = Config.getOption('UseVarLockSubsys', True) -+stop_on_removal_regex=re.compile('/etc/init.d/\$service stop > /dev/null') -+restart_on_update_regex=re.compile('/etc/init.d/\$service try-restart > /dev/null') ++stop_on_removal_regex=re.compile('bin/systemctl stop \$service >/dev/null') ++restart_on_update_regex=re.compile('bin/systemctl try-restart \$service >/dev/null') +insserv_cleanup_regex=re.compile('^\s*/sbin/insserv /etc/init.d$', re.MULTILINE) + LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start',