From e4868d9ad603f742724fac0e1067bd688d41283d Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 22 Nov 2016 10:47:43 +0000
Subject: [PATCH] elements: Drop unneeded DIB_INIT_SYSTEM usage
DIB_INIT_SYSTEM is exported by the dib-init-system element and contains
the output of the dib-init-system script so there is no need to
re-initialize it during various phases.
Change-Id: I09d6d10742689efe3d8eb9d64b539d6599b46227
---
elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces | 1 -
elements/enable-serial-console/install.d/20-stty | 1 -
2 files changed, 2 deletions(-)
diff --git a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
index 24c109ebd..f8e7a14e9 100755
--- a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
+++ b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
@@ -13,7 +13,6 @@ if [ "$DISTRO_NAME" != "gentoo" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh
fi
-DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
if [ -e "/etc/redhat-release" ] ; then
# the init system is upstart but networking is using sysv compatabiliy (i.e. Centos/RHEL 6)
diff --git a/elements/enable-serial-console/install.d/20-stty b/elements/enable-serial-console/install.d/20-stty
index 8e20b4034..6dd695c76 100755
--- a/elements/enable-serial-console/install.d/20-stty
+++ b/elements/enable-serial-console/install.d/20-stty
@@ -8,7 +8,6 @@ set -o pipefail
SCRIPTDIR=$(dirname $0)
-DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
install -m 0644 -o root -g root ${SCRIPTDIR}/ttySx.conf /etc/init/ttySx.conf
elif [ "$DIB_INIT_SYSTEM" == "systemd" ]; then