diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2003-05-07 16:45:01 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2003-05-07 16:45:01 +0000 |
| commit | 76eebc7f2ae1a8c63efb193b5ce0b8d9feabf4c2 (patch) | |
| tree | 896ef52fbaf58c2bb5107326379ca79ec339d409 | |
| parent | 6d717054c8f8e152601ccd1390e522cf2a40a16d (diff) | |
| download | xen-76eebc7f2ae1a8c63efb193b5ce0b8d9feabf4c2.tar.gz xen-76eebc7f2ae1a8c63efb193b5ce0b8d9feabf4c2.tar.bz2 xen-76eebc7f2ae1a8c63efb193b5ce0b8d9feabf4c2.zip | |
bitkeeper revision 1.213 (3eb9380dNpLXADof1Q707oFNYvY31Q)
Add flag -a for extra root params.
| -rw-r--r-- | tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java | 5 | ||||
| -rw-r--r-- | tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java index 1dd915686e..3181515df5 100644 --- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java +++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java @@ -13,7 +13,7 @@ public class CommandNew extends Command String image = getStringParameter(args, 'i', d.domainImage); String initrd = getStringParameter (args, 'r', d.domainInitRD); int vifs = getIntParameter(args, 'v', d.domainVIFs); - String bargs = getStringParameter (args, 'a', ""); + String bargs = getStringParameter (args, 'a', d.args); String root_dev = getStringParameter (args, 'd', d.rootDevice); String nfs_root_path = getStringParameter (args, 'f', d.NWNFSRoot); String nw_ip = getStringParameter (args, '4', d.NWIP); @@ -62,8 +62,7 @@ public class CommandNew extends Command } /* Set up boot parameters to pass to xi_build. */ - bargs = ""; - + bargs += " "; if (root_dev.equals ("/dev/nfs")) { if (vifs == 0) { return reportError ("Cannot use NFS root without VIFs configured"); diff --git a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java index bacce11a95..d30e941e5a 100644 --- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java +++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java @@ -26,6 +26,8 @@ public class Defaults int MaxDomainNumber; + String args = ""; + String XIToolsDir; /***********************************************************************/ @@ -65,6 +67,7 @@ public class Defaults System.out.println (" NWNFSServer " + NWNFSServer); System.out.println (" NWNFSRoot " + NWNFSRoot); System.out.println (" XIToolsDir " + XIToolsDir); + System.out.println (" args " + args); } /***********************************************************************/ @@ -129,6 +132,8 @@ public class Defaults NWNFSServer = s; } else if (lastName.equals ("nw_nfs_root")) { NWNFSRoot = s; + } else if (lastName.equals ("args")) { + args = s; } else if (lastName.equals ("max_domain_number")) { MaxDomainNumber = Integer.parseInt(s); } else if (lastName.equals ("xi_tools_dir")) { |