From 14c4cd626b812f9ee045fd5c5552f6675e86b17b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Jul 2018 20:51:10 +0000 Subject: [PATCH] final tweaks --- debian/wit-hypervisor.install | 3 +++ debian/{postinst.ex => wit-hypervisor.postinst} | 4 ++-- debian/{preinst.ex => wit-hypervisor.preinst} | 2 +- files/dhcp-sethostname | 8 ++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) rename debian/{postinst.ex => wit-hypervisor.postinst} (96%) rename debian/{preinst.ex => wit-hypervisor.preinst} (98%) create mode 100644 files/dhcp-sethostname diff --git a/debian/wit-hypervisor.install b/debian/wit-hypervisor.install index fa9d553..d9159b7 100644 --- a/debian/wit-hypervisor.install +++ b/debian/wit-hypervisor.install @@ -1,6 +1,7 @@ files/vrf.conf etc/iproute2/rt_tables.d files/vrf-dhcp-enter etc/dhcp/dhclient-enter-hooks.d files/vrf-dhcp-exit etc/dhcp/dhclient-exit-hooks.d +files/dhcp-sethostname etc/dhcp/dhclient-exit-hooks.d files/rc.local etc files/10-frr.conf etc/sysctl.d files/wit-gc usr/bin @@ -11,3 +12,5 @@ files/qemu-ifup-public etc/libvirt/hooks files/qemu-ifup etc/libvirt/hooks files/firewall etc/init.d files/interfaces etc/network +files/frr.conf.wit etc/frr +files/ipsec.conf.wit etc diff --git a/debian/postinst.ex b/debian/wit-hypervisor.postinst similarity index 96% rename from debian/postinst.ex rename to debian/wit-hypervisor.postinst index e5f7bb3..73c2c9a 100755 --- a/debian/postinst.ex +++ b/debian/wit-hypervisor.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # postinst script for #PACKAGE# # # see: dh_installdeb(1) @@ -22,7 +22,7 @@ case "$1" in configure) - export NODE_ID=$(ip -4 -br addr | grep 10.0. | awk '{ print $3 }' | awk 'BEGIN{FS="[./]"} { print $4 }') + [ -z $NODE_ID ] && export NODE_ID=$(ip -4 -br addr | grep 10.0. | awk '{ print $3 }' | awk 'BEGIN{FS="[./]"} { print $4 }') export MGMT_ID=$(ip -4 -br addr | grep 10.0. | awk '{ print $3 }' | awk 'BEGIN{FS="[./]"} { print $3 }') export MGMT_MAC=$(ip -br link show dev $(ip -4 -br addr | grep 10.0. | awk '{ print $1 }') | awk '{ print $3 }') diff --git a/debian/preinst.ex b/debian/wit-hypervisor.preinst similarity index 98% rename from debian/preinst.ex rename to debian/wit-hypervisor.preinst index ae36341..4f1aad4 100755 --- a/debian/preinst.ex +++ b/debian/wit-hypervisor.preinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # preinst script for #PACKAGE# # # see: dh_installdeb(1) diff --git a/files/dhcp-sethostname b/files/dhcp-sethostname new file mode 100644 index 0000000..346dab7 --- /dev/null +++ b/files/dhcp-sethostname @@ -0,0 +1,8 @@ +if [ ! -z $new_host_name ]; then + hostname $new_host_name + echo $new_host_name >/etc/hostname +fi +if [ ! -z $new_domain_name ]; then + host_name=$(hostname) + sed -i "s/\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$host_name.*/\1 $host_name.${new_domain_name:-local} $host_name/" /etc/hosts +fi