From 8e08d3ebd28b3ddd3f56c8e1c4618d5354d932f8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 29 Apr 2007 21:33:56 +0000
Subject: Fixed error from removing of "MAC", check the usage of macaddr for
 XEN! Gave more room for SLX version string. The variable $DISTRO is to be
 filled in with the export name (to be compatible with directory naming of
 config directories ...), see BootRootVerzeichnisse for that ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@965 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/etc/functions | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'initramfs/initrd-stuff/etc/functions')

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index e9f1a4c5..9f5ed45b 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -218,8 +218,8 @@ local netdev="eth${vifnum}"
 local pdev="p${netdev}"
 local vdev="veth${vifnum}"
 local vif0="vif0.${vifnum}"
-local mac=$(ip link show ${netdev} | sed -n '/^.*link\/ether/p' \
-  | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/')
+# fixme: that is the mac address of eth0 device
+local mac=$macaddr
 
 brctl addbr ${bridge}
 brctl stp ${bridge} off
@@ -373,7 +373,6 @@ if [ -n "$filesrc" ] ; then
   local cfgfile="/$(uri_token $filesrc path)"
   local tftpserver=$(checkip $(uri_token $filesrc server))
   tftpgetunpack $tftp $cfgfile $tftpserver
-  echo "tftpgetunpack $tftp $cfgfile $tftpserver" >> /tmp/confviafile
 else
   # predefined value for openslx environment; it is expected that this
   # directory is just below the tftpboot/tftproot (path to which the 
@@ -384,7 +383,7 @@ else
   # and try last distro default ...
   echo -e "\n## Configuration via fileget: Hierarchy is distro client \
 and as last\n# distro/default" >> /tmp/confviafile
-  mac=$(echo $MAC|sed "s/:/-/g")
+  mac=$(echo $macaddr|sed "s/:/-/g")
   for cfgfile in $cfgdir/$DISTRO/01-$mac.tgz $cfgdir/$DISTRO/default.tgz \
                  $cfgdir/01-$mac.tgz $cfgdir/default.tgz ; do
     tftpgetunpack $cfgfile $tftpserver && break
-- 
cgit v1.2.3-55-g7522