From eae869bc964aa9c348e580165dda233bd610ffede18a6216f83d4c993193912a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 9 Jan 2019 10:32:36 +0000 Subject: [PATCH] - do not create sysconfig.d when already exists [bsc#1121086] OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=574 --- apache2.changes | 5 +++++ start_apache2 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache2.changes b/apache2.changes index e693d57..1c002b6 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 10:26:46 UTC 2019 - Petr Gajdos + +- do not create sysconfig.d when already exists [bsc#1121086] + ------------------------------------------------------------------- Sun Jan 6 15:14:43 UTC 2019 - Dirk Mueller diff --git a/start_apache2 b/start_apache2 index af4dc61..c39c002 100644 --- a/start_apache2 +++ b/start_apache2 @@ -85,7 +85,7 @@ unset sysconfig_setting # # involve the sysconfig variables # -mkdir -p ${sysconfd_dir} || exit 1 +[ -d ${sysconfd_dir} ] || mkdir -p ${sysconfd_dir} || exit 1 for c in global.conf include.conf loadmodule.conf; do echo "# File generated from $SYSCONFIG_FILE, do not edit. Edit the sysconfig file instead." > ${sysconfd_dir}/$c done