From 70552c5dbd6ff117a226d59b288050e7553f8922 Mon Sep 17 00:00:00 2001 From: Sebastien Rannou Date: Tue, 1 Sep 2015 15:38:24 +0000 Subject: [PATCH] Removed DNS and hostname hooks (handled by the initrd). --- patches/etc/NetworkManager/dispatcher.d/11-dns | 10 ---------- .../NetworkManager/dispatcher.d/12-ochostname | 16 ---------------- 2 files changed, 26 deletions(-) delete mode 100755 patches/etc/NetworkManager/dispatcher.d/11-dns delete mode 100755 patches/etc/NetworkManager/dispatcher.d/12-ochostname diff --git a/patches/etc/NetworkManager/dispatcher.d/11-dns b/patches/etc/NetworkManager/dispatcher.d/11-dns deleted file mode 100755 index a1c6d25..0000000 --- a/patches/etc/NetworkManager/dispatcher.d/11-dns +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -interface=$1 -action=$2 - -if [ "$interface" = "eth0" -a "$action" = "up" ] -then - rm -f /etc/resolv.conf - ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf -fi diff --git a/patches/etc/NetworkManager/dispatcher.d/12-ochostname b/patches/etc/NetworkManager/dispatcher.d/12-ochostname deleted file mode 100755 index 6605147..0000000 --- a/patches/etc/NetworkManager/dispatcher.d/12-ochostname +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -interface=$1 -action=$2 - -if [ "$interface" = "eth0" -a "$action" = "up" ] -then - metadata_host_name=$(/usr/local/bin/oc-metadata --cached HOSTNAME) - if [ "x$metadata_host_name" != "x" ] - then - echo $metadata_host_name > /etc/hostname - sed "/^127.0.1.1[ \t].*$/ s/.*$/127.0.1.1\t$metadata_host_name/" -i /etc/hosts - sed "/^127.0.0.1[ \t]localhost/ s/localhost.*$/localhost $metadata_host_name/" -i /etc/hosts - hostnamectl set-hostname $metadata_host_name - fi -fi