Attachment 253837 Details for Bug 281701 – Add unquiet flag

[patch] Add unquiet flag

net_isc-dhcp44-server_checkconfig.diff (text/plain), 1.43 KB, created by Dag-Erling Smørgrav on 2024-09-26 19:39:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dag-Erling Smørgrav

Created: 2024-09-26 19:39:31 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/net/isc-dhcp44-server/files/isc-dhcpd.in b/net/isc-dhcp44-server/files/isc-dhcpd.in
>index b92fad444b43..711bc245f256 100644
>--- a/net/isc-dhcp44-server/files/isc-dhcpd.in
>+++ b/net/isc-dhcp44-server/files/isc-dhcpd.in
>@@ -499,15 +499,10 @@ dhcpd_restartprecmd ()
> 
> dhcpd_checkconfig ()
> {
>-        local rc_flags_mod
>         setup_flags
>-	rc_flags_mod="$rc_flags"
>-        # Eliminate '-q' flag if it is present
>-	case "$rc_flags" in
>-	*-q*)	rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;;
>-	esac
>-        if ! ${command} -t -q ${rc_flags_mod}; then
>-                err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
>+        if ! ${command} -t -q ${rc_flags}; then
>+		${command} -t ${rc_flags} -Q
>+                err 1 "Configuration file sanity check failed"
>         fi
> }
> 
>diff --git a/net/isc-dhcp44-server/files/patch-server_dhcpd.c b/net/isc-dhcp44-server/files/patch-server_dhcpd.c
>new file mode 100644
>index 000000000000..17e6c79025bb
>--- /dev/null
>+++ b/net/isc-dhcp44-server/files/patch-server_dhcpd.c
>@@ -0,0 +1,12 @@
>+--- server/dhcpd.c.orig	2022-09-28 14:39:15 UTC
>++++ server/dhcpd.c
>+@@ -492,6 +492,9 @@ main(int argc, char **argv) {
>+ 			cftest = 1;
>+ 			lftest = 1;
>+ 			log_perror = -1;
>++		} else if (!strcmp (argv [i], "-Q")) {
>++			quiet = 0;
>++			quiet_interface_discovery = 0;
>+ 		} else if (!strcmp (argv [i], "-q")) {
>+ 			quiet = 1;
>+ 			quiet_interface_discovery = 1;

Actions: View | Diff

Attachments on bug 281701: 253805 | 253822 | 253837