From ff183a100ea442e1ac9a9d530b5cae6c17c4c1a9 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Thu, 2 Jul 2015 11:41:20 +0200 Subject: [PATCH] sysmocom-configure: handle missing system.conf gracefully If /slot/system.conf is missing, we just exit the generator. --- recipes-config/sysmocom-configure/files/sysmocom-generator | 4 ++++ recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-config/sysmocom-configure/files/sysmocom-generator b/recipes-config/sysmocom-configure/files/sysmocom-generator index 40bb25c..b8f43e8 100755 --- a/recipes-config/sysmocom-configure/files/sysmocom-generator +++ b/recipes-config/sysmocom-configure/files/sysmocom-generator @@ -1,5 +1,9 @@ #!/bin/sh +if [ ! -e /slot/system.conf ]; then + exit 0 +fi + . /slot/system.conf for HANDLER in $(ls /etc/sysmocom/configure.d/*.sh); do diff --git a/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb index abecdba..f3fca7a 100644 --- a/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb +++ b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb @@ -14,7 +14,6 @@ do_install() { install -d ${D}${sysconfdir}/sysmocom/configure.d install -m 0755 ${WORKDIR}/*.sh ${D}${sysconfdir}/sysmocom/configure.d/ - } FILES_${PN} += "${systemd_unitdir}/system-generators"