From ccb49278270e77962d6bda89e3c453c2779316d2 Mon Sep 17 00:00:00 2001 From: oikuda Date: Wed, 15 May 2019 15:31:43 +0200 Subject: [PATCH] fix quagga on debian-9 and ubuntu-18.04 update quaggaboot.sh to call create /run/quagga for pid and other needed files update quaggaboot.sh to call init script if exists set debian-9 as latest now that quagga works modify README accordingly --- README.md | 14 +++++++------- build.sh | 2 +- common/quaggaboot.sh | 9 ++++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index beeb765..b73feda 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,13 @@ different variations: ## Versions Currently supported versions are as follows: -| Folder | Distribution and version | Image name | Comment | -| ----------------- | ------------------------ | -------------------------------- | --------------------------------------- | -| latest (debian-8) | Debian 8 (jessie) | imunes/template:latest | old packages, but working | -| debian-9 | Debian 9 (stretch) | imunes/template:debian-9 | newer packages, __quagga__ doesn't work | -| debian-9-min | Debian 9 minimal | imunes/template:debian-9-min | minimal, __quagga__ doesn't work | -| ubuntu-18.04 | Ubuntu 18.04 LTS | imunes/template:ubuntu-18.04 | __quagga__ doesn't work (systemd issue) | -| ubuntu-18.04-min | Ubuntu 18.04 LTS minimal | imunes/template:ubuntu-18.04-min | minimal, __quagga__ doesn't work | +| Folder | Distribution and version | Image name | Comment | +| ----------------- | ------------------------ | -------------------------------- | ------------------------------------ | +| latest (debian-8) | Debian 8 (jessie) | imunes/template:latest | old packages, but tested and working | +| debian-9 | Debian 9 (stretch) | imunes/template:debian-9 | newer packages, needs testing | +| debian-9-min | Debian 9 minimal | imunes/template:debian-9-min | minimal edition | +| ubuntu-18.04 | Ubuntu 18.04 LTS | imunes/template:ubuntu-18.04 | ubuntu release, needs testing | +| ubuntu-18.04-min | Ubuntu 18.04 LTS minimal | imunes/template:ubuntu-18.04-min | minimal edition | ## Credits This image is based on [Phusion](http://www.phusion.nl/) baseimage-docker and diff --git a/build.sh b/build.sh index fe4f081..8564869 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ NAME="imunes/template" # - https://github.com/docker/for-linux/issues/73 # - https://github.com/docker/for-linux/issues/502 ULIMITS="--ulimit nofile=10240:10240 --ulimit nproc=65356:65536" -LATEST_FOLDER="debian-8" +LATEST_FOLDER="debian-9" tag="latest" if [[ -n "$1" ]]; then diff --git a/common/quaggaboot.sh b/common/quaggaboot.sh index 9873a67..76b5d4e 100755 --- a/common/quaggaboot.sh +++ b/common/quaggaboot.sh @@ -1,6 +1,13 @@ #!/bin/sh -/etc/init.d/quagga start +run_dir='/run/quagga' +mkdir -p $run_dir +chown quagga:quagga $run_dir + +init_file='/etc/init.d/quagga' +if [ -f $init_file ]; then + $init_file start +fi zebra -dP0