ia64/xen-unstable

changeset 430:15a6ce81467e

bitkeeper revision 1.213 (3eb9380dNpLXADof1Q707oFNYvY31Q)

Add flag -a for extra root params.
author iap10@freefall.cl.cam.ac.uk
date Wed May 07 16:45:01 2003 +0000 (2003-05-07)
parents 25113ba8b8ef
children 3638da7273e4
files tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
line diff
     1.1 --- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java	Wed May 07 15:32:01 2003 +0000
     1.2 +++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java	Wed May 07 16:45:01 2003 +0000
     1.3 @@ -13,7 +13,7 @@ public class CommandNew extends Command
     1.4      String image = getStringParameter(args, 'i', d.domainImage);
     1.5      String initrd = getStringParameter (args, 'r', d.domainInitRD);
     1.6      int vifs = getIntParameter(args, 'v', d.domainVIFs);
     1.7 -    String bargs = getStringParameter (args, 'a', "");
     1.8 +    String bargs = getStringParameter (args, 'a', d.args);
     1.9      String root_dev = getStringParameter (args, 'd', d.rootDevice);
    1.10      String nfs_root_path = getStringParameter (args, 'f', d.NWNFSRoot);
    1.11      String nw_ip = getStringParameter (args, '4', d.NWIP);
    1.12 @@ -62,8 +62,7 @@ public class CommandNew extends Command
    1.13  	}
    1.14  	
    1.15  	/* Set up boot parameters to pass to xi_build. */
    1.16 -	bargs = "";
    1.17 -
    1.18 +        bargs += " ";
    1.19  	if (root_dev.equals ("/dev/nfs")) {
    1.20  	  if (vifs == 0) {
    1.21  	    return reportError ("Cannot use NFS root without VIFs configured");
     2.1 --- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java	Wed May 07 15:32:01 2003 +0000
     2.2 +++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java	Wed May 07 16:45:01 2003 +0000
     2.3 @@ -26,6 +26,8 @@ public class Defaults
     2.4  
     2.5    int MaxDomainNumber;
     2.6  
     2.7 +  String args = "";
     2.8 +
     2.9    String XIToolsDir;
    2.10  
    2.11    /***********************************************************************/
    2.12 @@ -65,6 +67,7 @@ public class Defaults
    2.13      System.out.println ("   NWNFSServer " + NWNFSServer);
    2.14      System.out.println ("   NWNFSRoot " + NWNFSRoot);
    2.15      System.out.println ("   XIToolsDir " + XIToolsDir);
    2.16 +    System.out.println ("   args " + args);
    2.17    }
    2.18  
    2.19    /***********************************************************************/
    2.20 @@ -129,6 +132,8 @@ public class Defaults
    2.21  	    NWNFSServer = s;
    2.22  	  } else if (lastName.equals ("nw_nfs_root")) {
    2.23  	    NWNFSRoot = s;
    2.24 +	  } else if (lastName.equals ("args")) {
    2.25 +	    args = s;
    2.26  	  } else if (lastName.equals ("max_domain_number")) {
    2.27  	    MaxDomainNumber = Integer.parseInt(s);
    2.28  	  } else if (lastName.equals ("xi_tools_dir")) {