From d6e1e0c65f52449e6c9ad17f1bc2d72e0050070c Mon Sep 17 00:00:00 2001 From: Sebastien Rannou Date: Fri, 19 Dec 2014 09:39:40 +0100 Subject: [PATCH] Added NetworkManaget to set hostname and properly configure network at startup. #1 --- Dockerfile | 8 +++++--- .../dispatcher.d/{ => pre-up.d}/12-ochostname | 0 2 files changed, 5 insertions(+), 3 deletions(-) rename patches/etc/NetworkManager/dispatcher.d/{ => pre-up.d}/12-ochostname (100%) diff --git a/Dockerfile b/Dockerfile index 92b0ee7..5ece41b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,11 @@ RUN mkdir /tmp/build-xnbd \ # Systemd -RUN systemctl enable sshd.service \ - && systemctl disable getty@tty1.service \ - && systemctl enable serial-getty@ttyS0.service +RUN systemctl disable getty@tty1.service \ + && systemctl disable systemd-networkd.service \ + && systemctl enable serial-getty@ttyS0.service \ + && systemctl enable sshd.service \ + && systemctl enable NetworkManager # Patch rootfs diff --git a/patches/etc/NetworkManager/dispatcher.d/12-ochostname b/patches/etc/NetworkManager/dispatcher.d/pre-up.d/12-ochostname similarity index 100% rename from patches/etc/NetworkManager/dispatcher.d/12-ochostname rename to patches/etc/NetworkManager/dispatcher.d/pre-up.d/12-ochostname