[meta-networking][PATCH 0/3] misc fixes

[meta-networking][PATCH 0/3] misc fixes

[Mark Hatle]

The following patch set includes some misc fixes for meta-networking.

These should be generally applicable, and can also be applied to the dora
branch (as well as master).

[meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem.

[Mark Hatle]

From: Bopeng Liu <bopeng.liu@windriver.com>

Change the default config file for making watchquagga can startup successful

Signed-off-by: Bopeng Liu <Bopeng.Liu@windriver.com>
---
 .../recipes-protocols/quagga/files/watchquagga.default           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
index 53f6a8c..2d601ec 100644
--- a/meta-networking/recipes-protocols/quagga/files/watchquagga.default
+++ b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
@@ -2,6 +2,11 @@
 #watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd"
 watch_daemons="zebra"
 
-# To enable restarts, uncomment this line (but first be sure to edit
+# To enable restarts when multiple daemons are being used, uncomment this line (but first be sure to edit
 # the WATCH_DAEMONS line to reflect the daemons you are actually using):
-watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
+#watch_options="-Az -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
+
+# Since we are using one quagga daemon for now, use the following line. If using
+# multiple daemons, comment the line below and uncoment the line mentioned
+# above.
+watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s"
-- 
1.8.1.2.545.g2f19ada

[meta-networking][PATCH 2/3] proftpd: Convert proftpd group to system scope

[Mark Hatle]

From: Qiang Chen <qiang.chen@windriver.com>

Proftpd is meant to be a system user, not a normal user of the
system so lets pass the correct parameters to the system.
Just add --system param when creating ftp group.

Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 6571b9c..29c3097 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -60,7 +60,7 @@ INITSCRIPT_NAME = "proftpd"
 INITSCRIPT_PARAM = "defaults 85 15"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "${FTPGROUP}"
+GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}"
 USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
 
 FILES_${PN} += "/home/${FTPUSER}"
-- 
1.8.1.2.545.g2f19ada

[meta-networking][PATCH 3/3] ntpd: make start-stop-daemon command available for ntpd

[Mark Hatle]

From: Qiang Chen <qiang.chen@windriver.com>

If ntpd script is being called by a non-root user using sudo,
it will fail as follows:

/etc/init.d/ntpd restart
Stopping ntpd: /etc/init.d/ntpd: line 29: start-stop-daemon:
command not found
done
Starting ntpd: /etc/init.d/ntpd: line 24: start-stop-daemon:
command not found
done

This is because /etc/init.d/ntpd calls start-stop-daemon which
is in /sbin (not in the default path for non-root users)

Explicitly configure the PATH to include /sbin.

Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>

Reworked to set PATH instead of hardcode the location of start-stop-daemon

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta-networking/recipes-support/ntp/files/ntpd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-support/ntp/files/ntpd b/meta-networking/recipes-support/ntp/files/ntpd
index ae50f13..53fa2d1 100755
--- a/meta-networking/recipes-support/ntp/files/ntpd
+++ b/meta-networking/recipes-support/ntp/files/ntpd
@@ -1,5 +1,7 @@
 #! /bin/sh
 #
+PATH=/sbin:/bin:/usr/bin:/usr/sbin
+
 # ntpd	init.d script for ntpdc from ntp.isc.org
 test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
 # rcS contains TICKADJ
-- 
1.8.1.2.545.g2f19ada

Re: [meta-networking][PATCH 2/3] proftpd: Convert proftpd group to system scope

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]

Merged this one, the other two are giving me a bit of grief.  I'll check
back soon if it's not a quick fix.

-J.

[[meta-networking][PATCH 2/3] proftpd: Convert proftpd group to system scope] On 13.11.19 (Tue 15:50) Mark Hatle wrote:

> From: Qiang Chen <qiang.chen@windriver.com>
> 
> Proftpd is meant to be a system user, not a normal user of the
> system so lets pass the correct parameters to the system.
> Just add --system param when creating ftp group.
> 
> Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> ---
>  meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> index 6571b9c..29c3097 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> @@ -60,7 +60,7 @@ INITSCRIPT_NAME = "proftpd"
>  INITSCRIPT_PARAM = "defaults 85 15"
>  
>  USERADD_PACKAGES = "${PN}"
> -GROUPADD_PARAM_${PN} = "${FTPGROUP}"
> +GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}"
>  USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
>  
>  FILES_${PN} += "/home/${FTPUSER}"
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem.

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]

Merged, thanks.
-J.

[[meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem.] On 13.11.19 (Tue 15:50) Mark Hatle wrote:

> From: Bopeng Liu <bopeng.liu@windriver.com>
> 
> Change the default config file for making watchquagga can startup successful
> 
> Signed-off-by: Bopeng Liu <Bopeng.Liu@windriver.com>
> ---
>  .../recipes-protocols/quagga/files/watchquagga.default           | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
> index 53f6a8c..2d601ec 100644
> --- a/meta-networking/recipes-protocols/quagga/files/watchquagga.default
> +++ b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
> @@ -2,6 +2,11 @@
>  #watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd"
>  watch_daemons="zebra"
>  
> -# To enable restarts, uncomment this line (but first be sure to edit
> +# To enable restarts when multiple daemons are being used, uncomment this line (but first be sure to edit
>  # the WATCH_DAEMONS line to reflect the daemons you are actually using):
> -watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
> +#watch_options="-Az -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
> +
> +# Since we are using one quagga daemon for now, use the following line. If using
> +# multiple daemons, comment the line below and uncoment the line mentioned
> +# above.
> +watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s"
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-networking][PATCH 3/3] ntpd: make start-stop-daemon command available for ntpd

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

Also merged.  Thanks.
-J.

[[meta-networking][PATCH 3/3] ntpd: make start-stop-daemon command available for ntpd] On 13.11.19 (Tue 15:50) Mark Hatle wrote:

> From: Qiang Chen <qiang.chen@windriver.com>
> 
> If ntpd script is being called by a non-root user using sudo,
> it will fail as follows:
> 
> /etc/init.d/ntpd restart
> Stopping ntpd: /etc/init.d/ntpd: line 29: start-stop-daemon:
> command not found
> done
> Starting ntpd: /etc/init.d/ntpd: line 24: start-stop-daemon:
> command not found
> done
> 
> This is because /etc/init.d/ntpd calls start-stop-daemon which
> is in /sbin (not in the default path for non-root users)
> 
> Explicitly configure the PATH to include /sbin.
> 
> Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> 
> Reworked to set PATH instead of hardcode the location of start-stop-daemon
> 
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>  meta-networking/recipes-support/ntp/files/ntpd | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-support/ntp/files/ntpd b/meta-networking/recipes-support/ntp/files/ntpd
> index ae50f13..53fa2d1 100755
> --- a/meta-networking/recipes-support/ntp/files/ntpd
> +++ b/meta-networking/recipes-support/ntp/files/ntpd
> @@ -1,5 +1,7 @@
>  #! /bin/sh
>  #
> +PATH=/sbin:/bin:/usr/bin:/usr/sbin
> +
>  # ntpd	init.d script for ntpdc from ntp.isc.org
>  test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
>  # rcS contains TICKADJ
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]