Accepting request 869761 from home:fbui:systemd:openSUSE-Factory

- systemd-sysv-convert: handle the case when services are migrated
  from SysV scripts to systemd units and are renamed at the same
  time (bsc#1181788)
  The list of such services is hard coded and contains only the
  'ntp->ntpd' translation.

OBS-URL: https://build.opensuse.org/request/show/869761
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1134

systemd-mini.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Feb  5 13:02:58 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- systemd-sysv-convert: handle the case when services are migrated
+  from SysV scripts to systemd units and are renamed at the same
+  time (bsc#1181788)
+
+  The list of such services is hard coded and contains only the
+  'ntp->ntpd' translation.
+
 -------------------------------------------------------------------
 Wed Feb  3 09:57:58 UTC 2021 - Franck Bui <fbui@suse.com>
 

systemd-sysv-convert

@@ -79,6 +79,14 @@ case "$1" in
 		# in the db only once.
 		database_add $initscript -1
 
+		# Some services were renamed during the transition from SySV init to
+		# systemd (bsc#1181788). Rather than letting packages fixing that
+		# themselves by hacking our database directly, let's hard-code renames
+		# here. Not really nice but that's the least worst solution.
+		case $initscript in
+		ntpd)	initscript=ntp ;;
+		esac
+
 		# The package is introducing new services and never has any sysv init
 		# scripts (bsc#982303).
 		if [ ! -r /etc/init.d/$initscript ] &&

systemd.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Feb  5 13:02:58 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- systemd-sysv-convert: handle the case when services are migrated
+  from SysV scripts to systemd units and are renamed at the same
+  time (bsc#1181788)
+
+  The list of such services is hard coded and contains only the
+  'ntp->ntpd' translation.
+
 -------------------------------------------------------------------
 Wed Feb  3 09:57:58 UTC 2021 - Franck Bui <fbui@suse.com>