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/07/24 22:57:23 UTC
svn commit: r1150512 -
/incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py
Author: rgass
Date: Sun Jul 24 22:57:22 2011
New Revision: 1150512
URL: http://svn.apache.org/viewvc?rev=1150512&view=rev
Log:
Auto generate the base-menu file for now until we incorporate it into the system
Modified:
incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py
Modified: incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py?rev=1150512&r1=1150511&r2=1150512&view=diff
==============================================================================
--- incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py (original)
+++ incubator/tashi/branches/zoni-dev/trunk/src/zoni/install/pxe/zoniPxeSetup.py Sun Jul 24 22:57:22 2011
@@ -57,17 +57,6 @@ def main():
ZoniPxeSetup(configs)
ZoniGetSyslinux(configs)
-
-def createDir(dirName):
- try:
- os.mkdir(dirName, 0755)
- print " Creating directory " + dirName
- except (OSError, Exception), e:
- if e.errno == 17:
- print " " + e.args[1] + ": " + dirName
- else:
- print " " + e.args[1] + ": " + dirName
-
@checkSuper
def ZoniPxeSetup(config):
tftpRootDir = config['tftpRootDir']
@@ -92,8 +81,11 @@ def ZoniPxeSetup(config):
# Find the base files to copy
pxeDir = os.path.join(installBaseDir, "src", "zoni", "install", "pxe")
- dirName = os.path.join(pxeDir, "base-menu")
- shutil.copy2(dirName, tftpBaseMenuFile)
+ #dirName = os.path.join(pxeDir, "base-menu")
+ #shutil.copy2(dirName, tftpBaseMenuFile)
+ print "open dir name ", tftpBaseMenuFile
+ open(tftpBaseMenuFile, 'w').write(zoniCreateBaseMenu(config))
+
dirName = os.path.join(pxeDir, "base.zoni")
shutil.copy2(dirName, tftpBaseFile)
# Copy over zoni pxe image
@@ -168,6 +160,29 @@ def ZoniGetSyslinux(config, ver=None):
shutil.copy2(tmpfile, tftpRootDir)
print "Finished"
+def zoniCreateBaseMenu(config):
+
+ a = ""
+ a += "DISPLAY boot-screens/boot.txt\n\n"
+ a += "LABEL zoni-register-64\n"
+ a += " kernel builds/amd64/zoni-reg/linux\n"
+ a += " append initrd=builds/amd64/zoni-reg/initrd.gz pxeserver=" + config['pxeServerIP'] + " imageserver=" + config['imageServerIP'] + " defaultimage=amd64-tashi_nm registerfile=register_node mode=register console=tty1 rw --\n"
+ a += "\n"
+ a += "LABEL zoni-register-64-interactive\n"
+ a += " kernel builds/amd64/zoni-reg/linux\n"
+ a += " append initrd=builds/amd64/zoni-reg/initrd_zoni_interactive.gz pxeserver=" + config['pxeServerIP'] + " imageserver=" + config['imageServerIP'] + " defaultimage=amd64-tashi_nm registerfile=register_node mode=register console=tty1 rw --\n"
+ a += "\n"
+ a += "LABEL localdisk\n"
+ a += " LOCALBOOT 0\n"
+ a += "LABEL rescue\n"
+ a += " kernel ubuntu-installer/hardy/i386/linux\n"
+ a += " append vga=normal initrd=ubuntu-installer/hardy/i386/initrd.gz rescue/enable=true --\n"
+ a += "\n"
+ a += "PROMPT 1\n"
+ a += "TIMEOUT 100\n"
+ return a
+
+
if __name__ in "__main__":