From 9c8bb684ba8cefea15754e92ac7adf2683e166de Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Aug 18 2016 18:54:32 +0000 Subject: [PATCH 1/3] add oci-register-machine and oci-systemd-hook The ostree tree from the initial release of fedora atomic 24 (24.39) included oci-register-machine and oci-systemd-hook, which centos and rhel atomic hosts also include. These hooks deal with systemd integration: (http://rhelblog.redhat.com/2016/06/30/whats-new-in-red-hat-enterprise-linux-atomic-host-7-2-5/) These packages were pulled in as a dependency of docker-1.10.3-9, but docker-1.10.3-24 does not, for some reason, pull them in -- both specify these as "Recommends," and that has not changed. In rhel and centos, these oci hook pages are "Requires" for docker, so it's unclear whether this issue would affect them. This commit adds these oci hooks in the json, to restore these systemd integration features to fedora atomic 24. (cherry picked from commit 1831f34f8a6ed1e6b3b6d8cd72697726a8696fef) --- diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json index 6633df0..11c85f2 100644 --- a/fedora-atomic-docker-host.json +++ b/fedora-atomic-docker-host.json @@ -79,6 +79,8 @@ "ceph-common", "oddjob-mkhomedir", "atomic-devmode", + "oci-register-machine", + "oci-systemd-hook", "runc"], "default_target": "multi-user.target", From f47eb4a642063efee8fbf0e77a95fd8d8346eb77 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Aug 18 2016 18:54:35 +0000 Subject: [PATCH 2/3] fix spacing All other lines have two tabs followed by a space. (cherry picked from commit 61257bae29ee19405f63d1d2c215c590209b0203) --- diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json index 11c85f2..a04ed21 100644 --- a/fedora-atomic-docker-host.json +++ b/fedora-atomic-docker-host.json @@ -79,8 +79,8 @@ "ceph-common", "oddjob-mkhomedir", "atomic-devmode", - "oci-register-machine", - "oci-systemd-hook", + "oci-register-machine", + "oci-systemd-hook", "runc"], "default_target": "multi-user.target", From 92da17069eb3ae65faf935f6e4a8a585e461f86f Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Aug 18 2016 18:54:38 +0000 Subject: [PATCH 3/3] Add in mdadm so we can support storage setups with software raid. (cherry picked from commit 8d2f0c6054a362661b4a68ed1f6f2dd8cccf5699) --- diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json index a04ed21..de55727 100644 --- a/fedora-atomic-docker-host.json +++ b/fedora-atomic-docker-host.json @@ -81,6 +81,7 @@ "atomic-devmode", "oci-register-machine", "oci-systemd-hook", + "mdadm", "runc"], "default_target": "multi-user.target",