Now depending on systemd's flavor.
This commit is contained in:
parent
edd132d2a3
commit
6e64443f27
|
@ -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/
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue