From 94906d4c79f15d31f83b698516ac1815e78160aa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 7 Feb 2021 13:08:10 -0800
Subject: [PATCH] dhcp: add basic logging functionality

vlogger should properly set tag and facility identically to logger if
you don't set anything special so it shoud be entirely safe to simply
exec straight into vlogger without explicitly setting those flags.

Fixes #25558
---
 srcpkgs/dhcp/files/dhclient/log/run | 2 ++
 srcpkgs/dhcp/files/dhclient/run     | 1 +
 srcpkgs/dhcp/files/dhcpd4/log/run   | 2 ++
 srcpkgs/dhcp/files/dhcpd4/run       | 1 +
 srcpkgs/dhcp/files/dhcpd6/log/run   | 2 ++
 srcpkgs/dhcp/files/dhcpd6/run       | 1 +
 6 files changed, 9 insertions(+)
 create mode 100644 srcpkgs/dhcp/files/dhclient/log/run
 create mode 100644 srcpkgs/dhcp/files/dhcpd4/log/run
 create mode 100644 srcpkgs/dhcp/files/dhcpd6/log/run

diff --git a/srcpkgs/dhcp/files/dhclient/log/run b/srcpkgs/dhcp/files/dhclient/log/run
new file mode 100644
index 000000000000..801e7bfcb843
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhclient/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger
diff --git a/srcpkgs/dhcp/files/dhclient/run b/srcpkgs/dhcp/files/dhclient/run
index 5cb45f19cf5a..19b924ab3c29 100644
--- a/srcpkgs/dhcp/files/dhclient/run
+++ b/srcpkgs/dhcp/files/dhclient/run
@@ -1,3 +1,4 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 exec dhclient ${OPTS:=-d} 
diff --git a/srcpkgs/dhcp/files/dhcpd4/log/run b/srcpkgs/dhcp/files/dhcpd4/log/run
new file mode 100644
index 000000000000..801e7bfcb843
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd4/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger
diff --git a/srcpkgs/dhcp/files/dhcpd4/run b/srcpkgs/dhcp/files/dhcpd4/run
index 05d9f9b726ed..423d87cc70dd 100644
--- a/srcpkgs/dhcp/files/dhcpd4/run
+++ b/srcpkgs/dhcp/files/dhcpd4/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 touch /var/lib/dhcp/dhcpd.leases
 exec dhcpd -f ${OPTS:=-4 -q -pf /run/dhcpd4.pid}
diff --git a/srcpkgs/dhcp/files/dhcpd6/log/run b/srcpkgs/dhcp/files/dhcpd6/log/run
new file mode 100644
index 000000000000..801e7bfcb843
--- /dev/null
+++ b/srcpkgs/dhcp/files/dhcpd6/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger
diff --git a/srcpkgs/dhcp/files/dhcpd6/run b/srcpkgs/dhcp/files/dhcpd6/run
index 2dc26f332212..57b86926acb7 100644
--- a/srcpkgs/dhcp/files/dhcpd6/run
+++ b/srcpkgs/dhcp/files/dhcpd6/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+exec 2>&1
 [ -r conf ] && . ./conf
 touch /var/lib/dhcp/dhcpd.leases
 exec dhcpd -f ${OPTS:=-6 -q -pf /run/dhcpd6.pid}