From 6e64443f27ca71bd342fd5b495b9da4fcc5d8bcc Mon Sep 17 00:00:00 2001
From: Sebastien Rannou <srannou@ocs.online.net>
Date: Fri, 17 Apr 2015 14:45:25 +0000
Subject: [PATCH] Now depending on systemd's flavor.

---
 Dockerfile                                             |  2 +-
 .../etc/systemd/system/oc-add-extra-volumes.service    | 10 ----------
 patches/etc/systemd/system/oc-ssh-keys.service         | 10 ----------
 .../etc/systemd/system/oc-sync-kernel-modules.service  | 10 ----------
 patches/etc/systemd/system/systemd-reboot.service      | 10 ----------
 5 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 patches/etc/systemd/system/oc-add-extra-volumes.service
 delete mode 100644 patches/etc/systemd/system/oc-ssh-keys.service
 delete mode 100644 patches/etc/systemd/system/oc-sync-kernel-modules.service
 delete mode 100644 patches/etc/systemd/system/systemd-reboot.service

diff --git a/Dockerfile b/Dockerfile
index 45daabd..89a45c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,7 +87,7 @@ RUN pacman --noconfirm -Suy
 
 
 # Patch rootfs
-RUN curl -Lkq http://j.mp/scw-skeleton | FLAVORS=common,docker-based bash -e
+RUN curl -Lkq http://j.mp/scw-skeleton | FLAVORS=common,docker-based,systemd bash -e
 ADD ./patches/etc/ /etc/
 ADD ./patches/usr/ /usr/
 
diff --git a/patches/etc/systemd/system/oc-add-extra-volumes.service b/patches/etc/systemd/system/oc-add-extra-volumes.service
deleted file mode 100644
index c21a364..0000000
--- a/patches/etc/systemd/system/oc-add-extra-volumes.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=SCW additional volumes mounter
-
-[Service]
-ExecStart=/usr/local/sbin/oc-add-extra-volumes
-ExecStop=/usr/local/sbin/oc-remove-extra-volumes
-Type=forking
-
-[Install]
-WantedBy=basic.target
diff --git a/patches/etc/systemd/system/oc-ssh-keys.service b/patches/etc/systemd/system/oc-ssh-keys.service
deleted file mode 100644
index da7d0f3..0000000
--- a/patches/etc/systemd/system/oc-ssh-keys.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=SCW fetch ssh keys from metadata
-After=NetworkManager-wait-online.service
-
-[Service]
-ExecStart=/bin/bash -c "mkdir -p /root/.ssh/ ; chmod 700 /root/.ssh ; /usr/local/bin/oc-metadata --cached | grep SSH_PUBLIC_KEYS_.*_KEY | cut -d'=' -f 2- | tr -d \\' > /root/.ssh/authorized_keys"
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/patches/etc/systemd/system/oc-sync-kernel-modules.service b/patches/etc/systemd/system/oc-sync-kernel-modules.service
deleted file mode 100644
index 996eb21..0000000
--- a/patches/etc/systemd/system/oc-sync-kernel-modules.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=SCW fetch kernel modules from Scaleway mirror
-After=NetworkManager-wait-online.service
-
-[Service]
-ExecStart=/usr/local/sbin/oc-sync-kernel-modules
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/patches/etc/systemd/system/systemd-reboot.service b/patches/etc/systemd/system/systemd-reboot.service
deleted file mode 100644
index e94dd5f..0000000
--- a/patches/etc/systemd/system/systemd-reboot.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Reboot
-Documentation=man:systemd-halt.service(8)
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/sbin/oc-nbd-disconnect-root