Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2013-10-04 10:58:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-09-26 19:38:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-10-04 10:58:09.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Oct 1 18:30:59 CEST 2013 - [email protected] + +- Include hyperv-keyboard if running in hyper-v guest (fate#315887) + +------------------------------------------------------------------- +Tue Oct 1 15:56:32 UTC 2013 - [email protected] + +- Fix iSCSI boot over IPv6 (bnc#830621) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh new/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh --- old/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh 2013-09-24 17:17:48.000000000 +0200 +++ new/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh 2013-10-01 18:32:03.000000000 +0200 @@ -28,12 +28,39 @@ echo $prefix } -ipcfg=$(echo $1 | sed 's/:/_:/g') +parse_prefix() { + local arg="$1" + + case "$arg" in + *.*) + # a.b.c.d IPv4 address + calc_prefix "$arg" + ;; + /*) + # /n + arg="${arg:1}" + echo $[arg] + ;; + *) + # prefix length + echo $[arg] + ;; + esac +} + +if [ "${1:0:1}" = "[" ]; then + cfg="${1:1}" + client="${cfg%%]:*}" + cfg="${cfg#*]:}" +else + client="${1%%:*}" + cfg="${1#*:}" +fi + +ipcfg=$(echo "$cfg" | sed 's/:/_:/g') set -- $(IFS=: ; echo $ipcfg ) -client=${1%%_} -shift if [ "$1" != "_" ] ; then peer=${1%%_} fi @@ -65,9 +92,12 @@ prefix=${client%%*/} if [ "$prefix" == "$client" ] ; then if [ -n "$netmask" ] ; then - prefix=$(calc_prefix $netmask) + prefix=$(parse_prefix $netmask) else - prefix=24 + case "$client" in + *:*) prefix=64 ;; + *) prefix=24 ;; + esac fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.0/mkinitrd.changes new/mkinitrd-2.8.0/mkinitrd.changes --- old/mkinitrd-2.8.0/mkinitrd.changes 2013-09-24 17:17:48.000000000 +0200 +++ new/mkinitrd-2.8.0/mkinitrd.changes 2013-10-01 18:32:03.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Oct 1 18:30:59 CEST 2013 - [email protected] + +- Include hyperv-keyboard if running in hyper-v guest (fate#315887) + +------------------------------------------------------------------- +Tue Oct 1 15:56:32 UTC 2013 - [email protected] + +- Fix iSCSI boot over IPv6 (bnc#830621) + +------------------------------------------------------------------- Tue Sep 24 17:16:19 CEST 2013 - [email protected] - Version 2.8.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/boot-ibft.sh new/mkinitrd-2.8.0/scripts/boot-ibft.sh --- old/mkinitrd-2.8.0/scripts/boot-ibft.sh 2013-09-24 17:17:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/boot-ibft.sh 2013-10-01 18:32:03.000000000 +0200 @@ -59,7 +59,17 @@ else nettype='static' fi - ip="$(ibft_get_att ip-addr)::$(ibft_get_att gateway):$(ibft_get_att subnet-mask):$ibft_hostname:$(ibft_get_ethdev):$nettype" + ipaddr="$(ibft_get_att ip-addr)" + case "$ipaddr" in + *:*) + netmask=64 + ipaddr="[$ipaddr]" + ;; + *) + netmask="$(ibft_get_att subnet-mask)" + ;; + esac + ip="$ipaddr::$(ibft_get_att gateway):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype" interface=$(ibft_get_ethdev) macaddress=$(ibft_get_att mac) InitiatorName=$(ibft_get_initiatorname) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/boot-network.sh new/mkinitrd-2.8.0/scripts/boot-network.sh --- old/mkinitrd-2.8.0/scripts/boot-network.sh 2013-09-24 17:17:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/boot-network.sh 2013-10-01 18:32:03.000000000 +0200 @@ -36,8 +36,15 @@ ipconfig $ip # dhcp information emulation - IPADDR="${ip%%:*}" - ip="${ip#*:}" # first entry => peeraddr + if [ "${ip:0:1}" = "[" ]; then + # address in brackets (necessary for IPv6) + ip="${ip:1}" + IPADDR="${ip%%]:*}" + ip="${ip#*]:}" + else + IPADDR="${ip%%:*}" + ip="${ip#*:}" + fi # first entry => peeraddr PEERADDR="${ip%%:*}" ip="${ip#*:}" # first entry => gwaddr GATEWAY="${ip%%:*}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/setup-fv_guest.sh new/mkinitrd-2.8.0/scripts/setup-fv_guest.sh --- old/mkinitrd-2.8.0/scripts/setup-fv_guest.sh 2013-09-24 17:17:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/setup-fv_guest.sh 2013-10-01 18:32:03.000000000 +0200 @@ -39,7 +39,7 @@ } if check_hyperv_guest ; then - fv_guest_modules="hv_storvsc hv_netvsc hyperv_fb" + fv_guest_modules="hv_storvsc hv_netvsc hyperv_fb hyperv-keyboard" elif check_xen_PVonHVM ; then # Use aliases because the module names differ in xenlinux and pv_ops kernel: # xen:vbd xen-vbd xen-blkfront -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
