diff mbox

quagga: Create /var/run/quagga on sysv

Message ID 1482293253-61002-1-git-send-email-matthew.weber@rockwellcollins.com
State Changes Requested
Headers show

Commit Message

Matt Weber Dec. 21, 2016, 4:07 a.m. UTC 
From: Brandon Maier <brandon.maier@rockwellcollins.com>

The /var/run/quagga directory needs to be created at boot in order for
Quagga to work. Without it Quagga will fail to create the pid lock file.
It's already supported in systemd, now add basic support for sysv.

Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
 package/quagga/S99quagga | 6 ++++++
 package/quagga/quagga.mk | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 package/quagga/S99quagga

Comments

Thomas Petazzoni Dec. 21, 2016, 9:03 a.m. UTC | #1 
Hello,

Thanks for this patch!

On Tue, 20 Dec 2016 22:07:33 -0600, Matt Weber wrote:

> diff --git a/package/quagga/S99quagga b/package/quagga/S99quagga
> new file mode 100644
> index 0000000..e964387
> --- /dev/null
> +++ b/package/quagga/S99quagga
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +
> +if [ ! -d /var/run/quagga ]; then
> +       mkdir -p /var/run/quagga
> +       chown quagga:quagga /var/run/quagga
> +fi

I think we would prefer to have a real init script, that not only
creates /var/run/quagga, but also starts quagga itself. I.e something
that does the same as the systemd unit file.

Thanks,

Thomas
Peter Korsgaard Dec. 21, 2016, 9:14 a.m. UTC | #2 
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > Thanks for this patch!

 > On Tue, 20 Dec 2016 22:07:33 -0600, Matt Weber wrote:

 >> diff --git a/package/quagga/S99quagga b/package/quagga/S99quagga
 >> new file mode 100644
 >> index 0000000..e964387
 >> --- /dev/null
 >> +++ b/package/quagga/S99quagga
 >> @@ -0,0 +1,6 @@
 >> +#!/bin/sh
 >> +
 >> +if [ ! -d /var/run/quagga ]; then
 >> +       mkdir -p /var/run/quagga
 >> +       chown quagga:quagga /var/run/quagga
 >> +fi

 > I think we would prefer to have a real init script, that not only
 > creates /var/run/quagga, but also starts quagga itself. I.e something
 > that does the same as the systemd unit file.

Yes, agreed. Also notice that the explicit /var/run/quagga check isn't
needed when you use mkdir -p.
Matt Weber Dec. 22, 2016, 2:21 p.m. UTC | #3 
Peter//Thomas,

On Wed, Dec 21, 2016 at 3:14 AM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
>
>  > Hello,
>  > Thanks for this patch!
>
>  > On Tue, 20 Dec 2016 22:07:33 -0600, Matt Weber wrote:
>
>  >> diff --git a/package/quagga/S99quagga b/package/quagga/S99quagga
>  >> new file mode 100644
>  >> index 0000000..e964387
>  >> --- /dev/null
>  >> +++ b/package/quagga/S99quagga
>  >> @@ -0,0 +1,6 @@
>  >> +#!/bin/sh
>  >> +
>  >> +if [ ! -d /var/run/quagga ]; then
>  >> +       mkdir -p /var/run/quagga
>  >> +       chown quagga:quagga /var/run/quagga
>  >> +fi
>
>  > I think we would prefer to have a real init script, that not only
>  > creates /var/run/quagga, but also starts quagga itself. I.e something
>  > that does the same as the systemd unit file.
>
> Yes, agreed. Also notice that the explicit /var/run/quagga check isn't
> needed when you use mkdir -p.

Thanks for the review, we're working on an update.
diff mbox

Patch

diff --git a/package/quagga/S99quagga b/package/quagga/S99quagga
new file mode 100644
index 0000000..e964387
--- /dev/null
+++ b/package/quagga/S99quagga
@@ -0,0 +1,6 @@ 
+#!/bin/sh
+
+if [ ! -d /var/run/quagga ]; then
+       mkdir -p /var/run/quagga
+       chown quagga:quagga /var/run/quagga
+fi
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index ad2aff4..4beff5d 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -79,4 +79,8 @@  define QUAGGA_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/usr/lib/systemd/system/quagga@.service
 endef
 
+define QUAGGA_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/quagga/S99quagga $(TARGET_DIR)/etc/init.d/S99quagga
+endef
+
 $(eval $(autotools-package))