Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2014-05-27 11:51:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hyper-v" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2014-04-14 06:43:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2014-05-27 11:51:21.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 26 15:50:21 CEST 2014 - [email protected] + +- copy mask2pfxlen from /etc/sysconfig/network/scripts/functions + to hv_set_ifconfig (bnc#879256) + +------------------------------------------------------------------- +Wed May 21 12:05:31 CEST 2014 - [email protected] + +- Start hyper-v helpers manually with helper script in inst-sys + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.spec ++++++ --- /var/tmp/diff_new_pack.TuzjtY/_old 2014-05-27 11:51:22.000000000 +0200 +++ /var/tmp/diff_new_pack.TuzjtY/_new 2014-05-27 11:51:22.000000000 +0200 @@ -195,6 +195,32 @@ # head -n 42 ${d}/*.rules # +helper=inst_sys.sh +cat > $RPM_BUILD_ROOT${bindir}/${helper} <<EOF +#!/bin/bash +# Starting daemons via RUN== in udev rules is not supported. +# In inst-sys systemd is not used, so start all daemons manually. +if test -d /sys/bus/vmbus/devices +then + export PATH=${bindir}:\$PATH + echo -n "Starting hyper-v helpers:" + for i in \ + %{hv_kvp_daemon} \ + %{hv_vss_daemon} \ + %{hv_fcopy_daemon} + do + if mkdir /run/\$i + then + echo -n " \$i" + \$i < /dev/null & + fi + done + echo " ... done" +fi +EOF +chmod 755 $RPM_BUILD_ROOT${bindir}/${helper} +head -n 123 $RPM_BUILD_ROOT${bindir}/${helper} +# %else mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/%{hv_kvp_daemon} ++++++ hyper-v.tools.hv.hv_set_ifconfig.sh ++++++ --- /var/tmp/diff_new_pack.TuzjtY/_old 2014-05-27 11:51:22.000000000 +0200 +++ /var/tmp/diff_new_pack.TuzjtY/_new 2014-05-27 11:51:22.000000000 +0200 @@ -44,14 +44,37 @@ fi # send subshell output to syslog ( -f=/etc/sysconfig/network/scripts/functions -if test -f ${f} -then - . ${f} -else - echo "MISSING ${f}" - exit 1 -fi +# copied from /etc/sysconfig/network/scripts/functions +mask2pfxlen() { + local i octet width=0 mask=(${1//./ }) + test ${#mask[@]} -eq 4 || return 1 + for octet in 0 1 2 3 + do + test "${mask[octet]}" -ge 0 -a "${mask[octet]}" -le 255 || return 1 + for i in 128 192 224 240 248 252 254 255 + do + test ${mask[octet]} -ge $i && ((width++)) + done + done + echo $width + return 0 +} + +pfxlen2mask() { + test -n "$1" || return 1 + local o i n=0 adr=() len=$(($1)) + for o in 0 1 2 3 + do + adr[$o]=0 + for i in 128 64 32 16 8 4 2 1 + do + ((n++ < len)) && ((adr[$o] = ${adr[$o]} + $i)) + done + done + echo ${adr[0]}.${adr[1]}.${adr[2]}.${adr[3]} + return 0 +} + # remove known config variables from environment unset HWADDR unset BOOTPROTO -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
