diff --git a/SOURCES/0818-udev-rules-make-tape-changers-also-apprear-in-dev-ta.patch b/SOURCES/0818-udev-rules-make-tape-changers-also-apprear-in-dev-ta.patch
new file mode 100644
index 0000000..8c748f5
--- /dev/null
+++ b/SOURCES/0818-udev-rules-make-tape-changers-also-apprear-in-dev-ta.patch
@@ -0,0 +1,57 @@
+From 13f9e172d4a3576efa1ddacaca26286266866d2d Mon Sep 17 00:00:00 2001
+From: Joerg Steffens <joerg.steffens@bareos.com>
+Date: Tue, 21 Nov 2017 12:21:49 +0100
+Subject: [PATCH] udev-rules: make tape-changers also apprear in
+ /dev/tape/by-path/
+
+It is important to be able to access tape changer ("Medium Changers") by
+persistant name.
+While tape devices can be accessed via /dev/tape/by-id/ and
+/dev/tape/by-path/, tape-changers could only be accessed by
+/dev/tape/by-id/.
+However, in some cases, especially when accessing Amazon Webservice
+Storage Gateway VTLs (or accessing iSCSI VTLs in general?) this does not
+work, as all tape devices and the tape changer have the same ENV{ID_SERIAL}.
+The results is, that only the last device is available in
+/dev/tape/by-id/, as the former devices have been overwritten.
+
+As this behavior is hard to change without breaking consistentcy,
+this additional device in /dev/tape/by-path/ can be used to access the medium changes.
+The tape devices can also be accessed by this path.
+
+The content of the directory will now look like:
+
+ # SCSI tape device, rewind (unchanged)
+ /dev/tape/by-path/$env{ID_PATH} -> ../../st*
+
+ # SCSI tape device, no-rewind (unchanged)
+ /dev/tape/by-path/$env{ID_PATH}-nst -> ../../nst*
+
+ # SCSI tape changer device (newly added)
+ /dev/tape/by-path/$env{ID_PATH}-changer -> ../../sg*
+
+Tape devices and tape changer have different ID_PATHs.
+SCSI tape changer get the suffix "-changer"
+to make them better distinguishable from tape devices.
+
+(cherry-picked from commit 7f8ddf96a25162f06bd94a684cf700c128d18142)
+(cherry picked from commit 1b723aea42e29becd0be2fdef990401803dbfba6)
+Resolves: #1814028
+---
+ rules/60-persistent-storage-tape.rules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/rules/60-persistent-storage-tape.rules b/rules/60-persistent-storage-tape.rules
+index f2eabd92a8..99898c147b 100644
+--- a/rules/60-persistent-storage-tape.rules
++++ b/rules/60-persistent-storage-tape.rules
+@@ -8,6 +8,9 @@ ACTION=="remove", GOTO="persistent_storage_tape_end"
+ SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --sg-version=3 --export --whitelisted -d $devnode", \
+ SYMLINK+="tape/by-id/scsi-$env{ID_SERIAL}"
+
++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{builtin}="path_id", \
++ SYMLINK+="tape/by-path/$env{ID_PATH}-changer"
++
+ SUBSYSTEM!="scsi_tape", GOTO="persistent_storage_tape_end"
+
+ KERNEL=="st*[0-9]|nst*[0-9]", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
diff --git a/SOURCES/0819-core-make-sure-to-restore-the-control-command-id-too.patch b/SOURCES/0819-core-make-sure-to-restore-the-control-command-id-too.patch
new file mode 100644
index 0000000..65e591d
--- /dev/null
+++ b/SOURCES/0819-core-make-sure-to-restore-the-control-command-id-too.patch
@@ -0,0 +1,30 @@
+From 714d1c41100be669bd106df9a0efa76e49182e69 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 22 Apr 2020 20:34:02 +0200
+Subject: [PATCH] core: make sure to restore the control command id, too
+
+Fixes: #15356
+(cherry picked from commit e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac)
+
+Resolves: #1837973
+---
+ src/core/service.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index e32cdf4594..df64fbaf60 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -2263,9 +2263,10 @@ static int service_deserialize_exec_command(Unit *u, const char *key, const char
+ break;
+ }
+
+- if (command && control)
++ if (command && control) {
+ s->control_command = command;
+- else if (command)
++ s->control_command_id = id;
++ } else if (command)
+ s->main_command = command;
+ else
+ log_unit_warning(u->id, "Current command vanished from the unit file, execution of the command list won't be resumed.");
diff --git a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
deleted file mode 100644
index c42f0b6..0000000
--- a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
-From: systemd team <systemd-maint@redhat.com>
-Date: Tue, 23 Apr 2019 10:46:19 -0300
-Subject: [PATCH] Update kernel-install script by backporting fedora patches
-
----
- src/kernel-install/kernel-install | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
-index f1c74de..d860701 100755
---- a/src/kernel-install/kernel-install
-+++ b/src/kernel-install/kernel-install
-@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2"
-
- if [[ -x /sbin/new-kernel-pkg ]]; then
- KERNEL_DIR="${KERNEL_IMAGE%/*}"
-- if [[ "${KERNEL_DIR}" != "/boot" ]]; then
-- for i in \
-- "$KERNEL_IMAGE" \
-- "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \
-- "$KERNEL_DIR"/System.map \
-- "$KERNEL_DIR"/config \
-- "$KERNEL_DIR"/zImage.stub \
-- "$KERNEL_DIR"/dtb \
-- ; do
-- [[ -e "$i" ]] || continue
-- cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
-- done
-- fi
-
- [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
- case "$COMMAND" in
- add)
-+ if [[ "${KERNEL_DIR}" != "/boot" ]]; then
-+ for i in \
-+ "$KERNEL_IMAGE" \
-+ "$KERNEL_DIR"/System.map \
-+ "$KERNEL_DIR"/config \
-+ "$KERNEL_DIR"/zImage.stub \
-+ "$KERNEL_DIR"/dtb \
-+ ; do
-+ [[ -e "$i" ]] || continue
-+ cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
-+ done
-+ # hmac is .vmlinuz-<version>.hmac so needs a special treatment
-+ i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
-+ if [[ -e "$i" ]]; then
-+ cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
-+ fi
-+ fi
- /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
- /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
- /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
---
-1.8.3.1
-
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index e4abec2..dad3582 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219
-Release: 73%{?dist}.6
+Release: 73%{?dist}.8
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -856,8 +856,8 @@ Patch0814: 0814-sd-journal-close-journal-files-that-were-deleted-by-.patch
Patch0815: 0815-sd-journal-remove-the-dead-code-and-actually-fix-146.patch
Patch0816: 0816-swap-adjust-swap.c-in-a-similar-way-to-what-we-just-.patch
Patch0817: 0817-swap-finish-the-secondary-swap-units-jobs-if-deactiv.patch
-
-Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+Patch0818: 0818-udev-rules-make-tape-changers-also-apprear-in-dev-ta.patch
+Patch0819: 0819-core-make-sure-to-restore-the-control-command-id-too.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@@ -1835,6 +1835,12 @@ fi
%{_mandir}/man8/systemd-resolved.*
%changelog
+* Mon May 25 2020 systemd maintenance team <systemd-maint@redhat.com> - 219-73.8
+- core: make sure to restore the control command id, too (#1837973)
+
+* Mon May 18 2020 systemd maintenance team <systemd-maint@redhat.com> - 219-73.7
+- udev-rules: make tape-changers also apprear in /dev/tape/by-path/ (#1814028)
+
* Mon Apr 06 2020 systemd maintenance team <systemd-maint@redhat.com> - 219-73.6
- sd-bus: when attached to an sd-event loop, disconnect on processing errors (#1817504)
- sd-journal: close journal files that were deleted by journald before we've setup inotify watch (#1820073)