From 734af024dc82f41ba661f308b39a839e1a09734c51138a73ac48086d5c238850 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 27 Sep 2013 15:20:25 +0000 Subject: [PATCH] - Added /etc/bindresvport.blacklist to dhcp server chroot file 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 --- dhcp.changes | 6 ++++++ rc.dhcpd | 2 +- rc.dhcpd6 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index be020c1..b498138 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -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 diff --git a/rc.dhcpd b/rc.dhcpd index 8704db5..c5cabb6 100644 --- a/rc.dhcpd +++ b/rc.dhcpd @@ -198,7 +198,7 @@ case "$1" in fi done 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 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; } diff --git a/rc.dhcpd6 b/rc.dhcpd6 index 28ac5f4..c93c80a 100644 --- a/rc.dhcpd6 +++ b/rc.dhcpd6 @@ -201,7 +201,7 @@ case "$1" in fi done 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 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; }