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

Accepting request 198233 from network:dhcp

Browse Source 
- Fixed to reload syslog on hostname changes using systemctl as
  there is no /etc/init.d/syslog script since syslog-service-2.0
  (bnc#830467).

OBS-URL: https://build.opensuse.org/request/show/198233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=81
This commit is contained in:
Stephan Kulow 2013-09-11 09:29:55 +00:00 committed by Git OBS Bridge
commit b1fdb7abc7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dhclient-script
View File

@ -256,7 +256,7 @@ set_hostname()
if [ -x /usr/bin/host ] ; then if [ -x /usr/bin/host ] ; then
if out=`host -W 2 "$new_ip_address" 2>/dev/null` ; then if out=`host -W 2 "$new_ip_address" 2>/dev/null` ; then
_hostname="`echo "$out" | sed 's:^.* ::; s:\..*::; s:.*[)]::'`" _hostname="`echo "$out" | sed 's:^.* ::; s:\..*::; s:.*[)]::'`"
[[ ${_hostname} =~ ${rx_host} ]] || unset _hostname [[ ${_hostname} =~ ${rx_host} ]] || unset _hostname
if [ "x${_hostname}" != "x" -a \ if [ "x${_hostname}" != "x" -a \
"x${_hostname}" != "x${current_hostname}" ]; then "x${_hostname}" != "x${current_hostname}" ]; then
hostname "${_hostname}" hostname "${_hostname}"
@ -279,7 +279,11 @@ set_hostname()
commit_cached_config_data $interface commit_cached_config_data $interface
# reload syslog so it knows the new hostname # reload syslog so it knows the new hostname
/etc/init.d/syslog reload if test -x /usr/sbin/systemctl ; then
/usr/sbin/systemctl reload syslog.service
else
/etc/init.d/syslog reload
fi
fi fi
fi fi
} }
@ -311,7 +315,7 @@ dhclient)
# STARTMODE # STARTMODE
eval `grep --no-filename \ eval `grep --no-filename \
'^[[:space:]]*STARTMODE=' \ '^[[:space:]]*STARTMODE=' \
"$SYSCONFIG_CFG_DIR/ifcfg-${interface}" 2>/dev/null` "$SYSCONFIG_CFG_DIR/ifcfg-${interface}" 2>/dev/null`
tmp_startmode=`read_cached_config_data startmode $INTERFACE` tmp_startmode=`read_cached_config_data startmode $INTERFACE`
[ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode" [ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode"
@ -360,7 +364,7 @@ dhclient6)
# STARTMODE # STARTMODE
eval `grep --no-filename \ eval `grep --no-filename \
'^[[:space:]]*STARTMODE=' \ '^[[:space:]]*STARTMODE=' \
"$SYSCONFIG_CFG_DIR/ifcfg-${interface}" 2>/dev/null` "$SYSCONFIG_CFG_DIR/ifcfg-${interface}" 2>/dev/null`
tmp_startmode=`read_cached_config_data startmode $INTERFACE` tmp_startmode=`read_cached_config_data startmode $INTERFACE`
[ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode" [ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode"
else else

7
dhcp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 10 13:04:10 UTC 2013 - mt@suse.com
- Fixed to reload syslog on hostname changes using systemctl as
there is no /etc/init.d/syslog script since syslog-service-2.0
(bnc#830467).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 26 09:27:19 UTC 2013 - mmeister@suse.com Fri Apr 26 09:27:19 UTC 2013 - mmeister@suse.com