rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

- Added /etc/bindresvport.blacklist to dhcp server chroot file

Browse Source 
lists as it seems to block its start in some cases (bnc#842360).

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=113
This commit is contained in:
Marius Tomaschewski 2013-09-27 15:20:25 +00:00 committed by Git OBS Bridge
parent 920ff4f575
commit 734af024dc
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 27 15:16:26 UTC 2013 - mt@suse.com
- Added /etc/bindresvport.blacklist to dhcp server chroot file
lists as it seems to block its start in some cases (bnc#842360).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 10 13:04:10 UTC 2013 - mt@suse.com Tue Sep 10 13:04:10 UTC 2013 - mt@suse.com

2
rc.dhcpd
View File

@ -198,7 +198,7 @@ case "$1" in
fi fi
done done
rm -f $CHROOT_PREFIX/dev/urandom rm -f $CHROOT_PREFIX/dev/urandom
for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime} /dev/urandom; do for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime,bindresvport.blacklist} /dev/urandom; do
if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary
cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \ cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \
|| { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; }

2
rc.dhcpd6
View File

@ -201,7 +201,7 @@ case "$1" in
fi fi
done done
rm -f $CHROOT_PREFIX/dev/urandom rm -f $CHROOT_PREFIX/dev/urandom
for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime} /dev/urandom; do for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime,bindresvport.blacklist} /dev/urandom; do
if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary
cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \ cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \
|| { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; }