vmchooser:

    * fixed bug: Linux sessions getting message "Starting Image:"
    * added <computername param=* /> - parseable by bootpgm


git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/vmchooser/trunk@2476 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 110 insertions, 87 deletions

diff --git a/vmchooser/addInfo.cxx b/vmchooser/addInfo.cxx
new file mode 100644
index 0000000..1076a36
--- /dev/null
+++ b/vmchooser/addInfo.cxx
@@ -0,0 +1,106 @@
+#include "inc/functions.h"
+
+#include <iostream>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+
+/******************************************
+ * Adds user info and hostname to xml
+ *
+ * usernode: <username param="user" />
+ * hostnamenode: <hostname param="host" />
+ * computername: needed for bootpgm <computername .../>
+ ******************************************/
+void addInfo(xmlNode* node) {
+  
+  if(node == NULL) {
+    return;
+  }
+  
+  bool user = false;
+  bool host = false;
+  
+  const int MAX_LENGTH = 200;
+  char hostname[MAX_LENGTH];
+  uid_t id;
+  passwd *pwd;
+  
+  string strline;
+  xmlNodePtr cur = node->children;
+  xmlNodePtr usernode = NULL;
+  xmlNodePtr hostnamenode = NULL;
+  xmlNodePtr compnamenode = NULL;
+  xmlNodePtr firstchild = node->children;
+ 
+  // just use some standard Linux functions here ...
+  id = geteuid(); // gets effective user id
+  pwd = getpwuid(id); // gets passwd struct (including username)
+  gethostname(hostname, MAX_LENGTH-1); // gets hostname
+ 
+  // Get <username> node and add "username#param" attribute
+  while(cur != NULL) {
+    if (!xmlStrcmp(cur->name, (const xmlChar *)"username")){
+      user = true;
+      usernode = cur;
+      break;
+    }
+    cur = cur->next;
+  }
+  if(! user) {
+    usernode = xmlNewNode(NULL, (const xmlChar*) "username");
+    if(usernode != NULL ) {
+      xmlNewProp(usernode, (const xmlChar*) "param", (const xmlChar*) pwd->pw_name);
+      xmlAddChild(node, usernode);
+    }
+    else {
+      cerr << "<username> node could not be created!" << endl;
+    }
+  }
+  else {
+    // set param attribute in <username>
+    xmlSetProp(usernode, (const xmlChar*) "param", (const xmlChar*) pwd->pw_name);
+  }
+
+  cur = node->children;
+ 
+  // Get <hostname> node and add "hostname#param" attribute
+  while(cur != NULL) {
+    if (!xmlStrcmp(cur->name, (const xmlChar *)"hostname")){
+      host = true;
+      hostnamenode = cur;
+      break;
+    }
+    cur = cur->next;
+  }
+  if(! host) {
+    hostnamenode = xmlNewNode(NULL, (const xmlChar*) "hostname");
+    if(hostnamenode != NULL ) {
+      xmlNewProp(hostnamenode, (const xmlChar*) "param", (const xmlChar*) hostname);
+      xmlAddChild(node, hostnamenode);
+    }
+    else {
+      cerr << "<hostname> node could not be created!" << endl;
+    }
+    compnamenode = xmlNewNode(NULL, (const xmlChar*) "computername");
+    if(compnamenode != NULL) {
+      xmlNewProp(compnamenode, (const xmlChar*) "param", (const xmlChar*) hostname);
+      // Add this node to the beginning of available children
+      // -> that is because bootpgm only looks in the first 500 chars
+      if(firstchild != NULL) {
+        xmlAddPrevSibling(firstchild, compnamenode);
+      }
+      xmlFreeNode(compnamenode);
+    }
+    else {
+      cerr << "<computername> node could not be created!" << endl;
+    }
+  }
+  else {
+    // add param value to existant hostname-node
+    xmlSetProp(hostnamenode, (const xmlChar*) "param", (xmlChar*) hostname);
+  }
+ 
+  return;
+}
+
diff --git a/vmchooser/addPrinters.cxx b/vmchooser/addPrinters.cxx
index 9505e90..f69ba56 100644
--- a/vmchooser/addPrinters.cxx
+++ b/vmchooser/addPrinters.cxx
@@ -6,9 +6,6 @@
 #include <string>
 #include <vector>
 #include <queue>
-#include <unistd.h>
-#include <pwd.h>
-#include <sys/types.h>
 
 /**
  * function addPrinters(xmlNode* node, char* script)
@@ -133,88 +130,6 @@ bool addPrinters(xmlNode* node, char* script) {
 }
 
 
-/******************************************
- * Adds user info and hostname to xml
- *
- * usernode: <username param="user" />
- * hostnamenode: <hostname param="host" />
- ******************************************/
-void addInfo(xmlNode* node) {
-  
-  if(node == NULL) {
-    return;
-  }
-  
-  bool user = false;
-  bool host = false;
-  
-  const int MAX_LENGTH = 200;
-  char hostname[MAX_LENGTH];
-  uid_t id;
-  passwd *pwd;
-  
-  string strline;
-  xmlNodePtr cur = node->children;
-  xmlNodePtr usernode = NULL;
-  xmlNodePtr hostnamenode = NULL;
- 
-  // just use some standard Linux functions here ...
-  id = geteuid(); // gets effective user id
-  pwd = getpwuid(id); // gets passwd struct (including username)
-  gethostname(hostname, MAX_LENGTH-1); // gets hostname
- 
-  // Get <username> node and add "username#param" attribute
-  while(cur != NULL) {
-    if (!xmlStrcmp(cur->name, (const xmlChar *)"username")){
-      user = true;
-      usernode = cur;
-      break;
-    }
-    cur = cur->next;
-  }
-  if(! user) {
-    usernode = xmlNewNode(NULL, (const xmlChar*) "username");
-    if(usernode != NULL ) {
-      xmlNewProp(usernode, (const xmlChar*) "param", (const xmlChar*) pwd->pw_name);
-      xmlAddChild(node, usernode);
-    }
-    else {
-      cerr << "<username> node could not be created!" << endl;
-    }
-  }
-  else {
-    // set param attribute in <username>
-    xmlSetProp(usernode, (const xmlChar*) "param", (const xmlChar*) pwd->pw_name);
-  }
-
-  cur = node->children;
- 
-  // Get <hostname> node and add "hostname#param" attribute
-  while(cur != NULL) {
-    if (!xmlStrcmp(cur->name, (const xmlChar *)"hostname")){
-      host = true;
-      hostnamenode = cur;
-      break;
-    }
-    cur = cur->next;
-  }
-  if(! host) {
-    hostnamenode = xmlNewNode(NULL, (const xmlChar*) "hostname");
-    if(hostnamenode != NULL ) {
-      xmlNewProp(hostnamenode, (const xmlChar*) "param", (const xmlChar*) hostname);
-      xmlAddChild(node, hostnamenode);
-    }
-    else {
-      cerr << "<hostname> node could not be created!" << endl;
-    }
-  }
-  else {
-    // add param value to existant hostname-node
-    xmlSetProp(hostnamenode, (const xmlChar*) "param", (xmlChar*) hostname);
-  }
- 
-  return;
-}
 
 
 
diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx
index 6ffa51f..d9f9259 100644
--- a/vmchooser/runImage.cxx
+++ b/vmchooser/runImage.cxx
@@ -59,8 +59,10 @@ void runImage(fltk::Widget*, void* p)
     case 0:
       mainwin->destroy();
       fltk::wait();
-      cout << "calling " << argv[1] << endl;
-      execvp(argv[0], argv);
+      if(dat.imgtype == VMWARE || dat.imgtype == VBOX) {
+        cout << "calling " << argv[1] << endl;
+        execvp(argv[0], argv);
+      }
       break;
     default:
       // this is not really useful, as this