[node-patches] Change in ovirt-node[master]: ovirt-init-functions: Grab 06 or 07 bytes for BOOTIF karg

[dougsland at redhat.com]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt-init-functions: Grab 06 or 07 bytes for BOOTIF karg
......................................................................

ovirt-init-functions: Grab 06 or 07 bytes for BOOTIF karg

BOOTIF kernel argument takes the network interface as parameter
or the 06 bytes of mac address using dashs between the bytes.
Currently, the ovirt-init-functions.sh expects 07 bytes instead of 06 bytes of mac
address because PXE IPAPPEND always appends "01-" to the front of the MAC.
However, if user provides the 06 bytes of MAC address manually to the GRUB to
append to the boot the autoinstall doesn't work.
This patch adds the "or" statement for validate 06 or 07 bytes during the
ovirt-node boot.

Change-Id: I8bfcc8ddabc74ee67d1a175fd4824ed9173c0215
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1199035
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/54/38454/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index f142e18..27c2c6d 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -458,7 +458,7 @@
                 fi
                 done
                 ;;
-                ??-??-??-??-??-??-??)
+                ??-??-??-??-??-??|??-??-??-??-??-??-??)
                 i=${i#??-}
                 bootif=$(grep -il $(echo $i|sed 's/-/:/g') /sys/class/net/[ep]*/address|rev|cut -d/ -f2|rev)
                 ;;


-- 
To view, visit https://gerrit.ovirt.org/38454
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bfcc8ddabc74ee67d1a175fd4824ed9173c0215
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>