Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2012-11-02 17:36:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyper-v", Maintainer is "OHering@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2012-10-23 19:37:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2012-11-02 17:36:59.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 26 17:13:40 CEST 2012 - ohering@suse.de + +- update hv_set_ifconfig to work with our ifcfg + +------------------------------------------------------------------- @@ -12 +17 @@ -- update kv_kvp_daemon to 3.7-rc1 state [fate#31441] +- update kv_kvp_daemon to 3.7-rc1 state [fate#314441] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.tools.hv.hv_set_ifconfig.sh ++++++ --- /var/tmp/diff_new_pack.bIqpxw/_old 2012-11-02 17:37:00.000000000 +0100 +++ /var/tmp/diff_new_pack.bIqpxw/_new 2012-11-02 17:37:00.000000000 +0100 @@ -1,7 +1,4 @@ #!/bin/bash - -# This example script activates an interface based on the specified -# configuration. # # In the interest of keeping the KVP daemon code free of distro specific # information; the kvp daemon code invokes this external script to configure @@ -10,13 +7,6 @@ # The only argument to this script is the configuration file that is to # be used to configure the interface. # -# Each Distro is expected to implement this script in a distro specific -# fashion. For instance on Distros that ship with Network Manager enabled, -# this script can be based on the Network Manager APIs for configuring the -# interface. -# -# This example script is based on a RHEL environment. -# # Here is the format of the ip configuration file: # # HWADDR=macaddr @@ -45,24 +35,49 @@ # is expected to return the configuration that is set via the SET # call. # - - - -echo "IPV6INIT=yes" >> $1 -echo "NM_CONTROLLED=no" >> $1 -echo "PEERDNS=yes" >> $1 -echo "ONBOOT=yes" >> $1 - -dhcp=$(grep "DHCP" $1 2>/dev/null) -if [ "$dhcp" != "" ]; +cfg=$1 +if ! test -f "${cfg}" then -echo "BOOTPROTO=dhcp" >> $1; + : expect configuration datafile as first argument + exit 1 +fi +# +( +unset DHCP +unset IF_NAME +. "$1" +if test -z "${IF_NAME}" +then + echo "Missing IF_NAME= in ${cfg}" + exit 1 +fi +# +t=`mktemp` +if test -z "${t}" +then + exit 1 fi -cp $1 /etc/sysconfig/network-scripts/ - +_exit() { + rm -f "${t}" +} +trap _exit EXIT +# +cat >> "${t}" <<_EOF_ +# contents from $0 $* +`cat "${cfg}"` +# +# additional options: +STARTMODE=auto +_EOF_ -interface=$(echo $1 | awk -F - '{ print $2 }') +if test "${DHCP}" = "yes" +then + echo "BOOTPROTO=dhcp" >> ${t}; +fi -/sbin/ifdown $interface 2>/dev/null -/sbin/ifup $interfac 2>/dev/null +echo "$0: working on network interface ifcfg-${IF_NAME}" +cp -b ${t} /etc/sysconfig/network/ifcfg-${IF_NAME} +ifdown ${IF_NAME} -o hotplug +ifup ${IF_NAME} -o hotplug +) 2>&1 | logger -t "${0##*/}[$PPID / $$]" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org