Attachment 45076 Details for Bug 69590 – file.diff

[patch] file.diff

file.diff (text/plain), 3.00 KB, created by Craig Rodrigues on 2004-07-25 18:30:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Rodrigues

Created: 2004-07-25 18:30:24 UTC

Size: 3.00 KB

patch

obsolete

>Index: isc-dhcpd.sh.sample
>===================================================================
>RCS file: /home/ncvs/ports/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample,v
>retrieving revision 1.7
>diff -u -r1.7 isc-dhcpd.sh.sample
>--- isc-dhcpd.sh.sample	6 Jul 2004 00:57:13 -0000	1.7
>+++ isc-dhcpd.sh.sample	25 Jul 2004 17:15:06 -0000
>@@ -17,24 +17,24 @@
> paranoia=%%PARANOIA%%				# compiled in paranoia?
> jail=%%JAIL%%				# compiled in jail?
> 
>-# override these variables in /etc/rc.conf
>-dhcpd_enable=NO
>-dhcpd_flags= # -q -early_chroot		# command option(s)
>-dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
>-dhcpd_ifaces=				# ethernet interface(s)
>-dhcpd_withumask=022			# file creation mask
>-
>-dhcpd_chuser_enable=YES			# runs w/o privileges?
>-dhcpd_withuser=${name}			# user name to run as
>-dhcpd_withgroup=${name}			# group name to run as
>+# set these variables if they are not defined in /etc/rc.conf
>+[ -z "$dhcpd_enable" ] && dhcpd_enable="NO"
>+[ -z "$dhcpd_flags" ] && dhcpd_flags= # -q -early_chroot	# command option(s)
>+[ -z "$dhcpd_conf" ] && dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
>+[ -z "$dhcpd_ifaces" ] && dhcpd_ifaces=		# ethernet interface(s)
>+[ -z "$dhcpd_withumask" ] && dhcpd_withumask=022	# file creation mask
>+
>+[ -z "$dhcpd_chuser_enable" ] && dhcpd_chuser_enable=YES			# runs w/o privileges?
>+[ -z "$dhcpd_withuser" ] && dhcpd_withuser=${name}	# user name to run as
>+[ -z "$dhcpd_withgroup" ] && dhcpd_withgroup=${name}	# group name to run as
> 
>-dhcpd_chroot_enable=NO			# runs chrooted?
>-dhcpd_rootdir=/var/db/${name}		# directory to run in
>+[ -z "$dhcpd_chroot_enable" ] && dhcpd_chroot_enable=NO	# runs chrooted?
>+[ -z "$dhcpd_rootdir" ] && dhcpd_rootdir=/var/db/${name}	# directory to run in
> 
> # untested
>-dhcpd_jail_enable=NO			# runs imprisoned?
>-dhcpd_hostname=				# jail hostname
>-dhcpd_ipaddress=			# jail ip address
>+[ -z "$dhcpd_jail_enable" ] && dhcpd_jail_enable=NO	# runs imprisoned?
>+[ -z "$dhcpd_hostname" ] && dhcpd_hostname=		# jail hostname
>+[ -z "$dhcpd_ipaddress" ] && dhcpd_ipaddress=		# jail ip address
> 
> safe_run ()	# rc command [args...]
> {
>Index: isc-dhcrelay.sh.sample
>===================================================================
>RCS file: /home/ncvs/ports/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample,v
>retrieving revision 1.2
>diff -u -r1.2 isc-dhcrelay.sh.sample
>--- isc-dhcrelay.sh.sample	16 Mar 2004 20:31:15 -0000	1.2
>+++ isc-dhcrelay.sh.sample	25 Jul 2004 17:15:06 -0000
>@@ -11,11 +11,11 @@
> # dhcrelay_enable="YES"
> #
> 
>-# override these variables in /etc/rc.conf
>-dhcrelay_enable=NO
>-dhcrelay_flags=				# command option(s)
>-dhcrelay_servers=			# dhcrelay server(s)
>-dhcrelay_ifaces=			# ethernet interface(s)
>+# set these variables if they have not been defined in /etc/rc.conf
>+[ -z "$dhcrelay_enable" ] && dhcrelay_enable="NO"
>+[ -z "$dhcrelay_flags" ] && dhcrelay_flags=		# command option(s)
>+[ -z "$dhcrelay_servers" ] && dhcrelay_servers=	# dhcrelay server(s)
>+[ -z "$dhcrelay_ifaces" ] && dhcrelay_ifaces=		# ethernet interface(s)
> 
> dhcrelay_precmd ()
> {

Actions: View | Diff

Attachments on bug 69590: 45076