From 32322960234c8ec91e0d42835a3ec5ee63305070 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 2 Feb 2019 11:00:00 +0100 Subject: Adding upstream version 20190202. Signed-off-by: Daniel Baumann --- .../config/hooks/normal/0001-os-release.chroot | 15 +++++++++++++++ .../config/hooks/normal/0002-knot-resolver.chroot | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100755 system-images/share/images/container-server/config/hooks/normal/0001-os-release.chroot create mode 100755 system-images/share/images/container-server/config/hooks/normal/0002-knot-resolver.chroot (limited to 'system-images/share/images/container-server/config/hooks/normal') diff --git a/system-images/share/images/container-server/config/hooks/normal/0001-os-release.chroot b/system-images/share/images/container-server/config/hooks/normal/0001-os-release.chroot new file mode 100755 index 0000000..2ec2ab6 --- /dev/null +++ b/system-images/share/images/container-server/config/hooks/normal/0001-os-release.chroot @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +BUILD_ID="$(date +%Y%m%d)" +VARIANT="Container Server" +VARIANT_ID="container-server" + +if [ -e /etc/os-release ] +then + sed -i -e "s|\(BUILD_ID\)=.*$|\1=\"${BUILD_ID}\"|" \ + -e "s|\(VARIANT\)=.*$|\1=\"${VARIANT}\"|" \ + -e "s|\(VARIANT_ID\)=.*$|\1=\"${VARIANT_ID}\"|" \ + /etc/os-release +fi diff --git a/system-images/share/images/container-server/config/hooks/normal/0002-knot-resolver.chroot b/system-images/share/images/container-server/config/hooks/normal/0002-knot-resolver.chroot new file mode 100755 index 0000000..7038e74 --- /dev/null +++ b/system-images/share/images/container-server/config/hooks/normal/0002-knot-resolver.chroot @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +cat > /etc/resolv.conf << EOF +nameserver 127.0.0.1 +nameserver 8.8.8.8 +nameserver 8.8.4.4 + +options timeout:1 attempts:1 +EOF -- cgit v1.2.3