You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by rg...@apache.org on 2011/09/29 00:10:01 UTC
svn commit: r1177118 -
/incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py
Author: rgass
Date: Thu Sep 29 00:10:00 2011
New Revision: 1177118
URL: http://svn.apache.org/viewvc?rev=1177118&view=rev
Log:
forgot to specify initrd image name. Seperate it from the options line
Modified:
incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py
Modified: incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py?rev=1177118&r1=1177117&r2=1177118&view=diff
==============================================================================
--- incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py (original)
+++ incubator/tashi/branches/zoni-dev/trunk/src/zoni/bootstrap/pxe.py Thu Sep 29 00:10:00 2011
@@ -130,11 +130,12 @@ class Pxe(BootStrapInterface):
name = self.tftpBootOptionsDir + "/" + image + "-menu"
kOpt= self.data.getKernelOptions(image)
kernelPath = os.path.join(self.kernelRoot, kOpt['kernel_arch'], kOpt['kernel_name'])
+ initrdPath = os.path.join(self.initrdRoot, kOpt['kernel_arch'], kOpt['initrd_name'])
val = "DISPLAY boot-screens/boot.txt\n\n"
val += "LABEL %s\n" % kOpt['image_name']
val += " MENU DEFAULT\n"
val += " kernel %s\n" % kernelPath
- val += " append %s\n" % kOpt['initrd_options']
+ val += " append initrd=%s %s\n" % (initrdPath, kOpt['initrd_options'])
f = open(name, "w")
f.write(val)