diff options
author | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-16 10:00:03 +0000 |
---|---|---|
committer | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-16 10:00:03 +0000 |
commit | e77e33257ff0375e42992547a2660836fafb0d17 (patch) | |
tree | 57d36ed150eb295f2d17f2dd0ba933fbc13197ab /xen-2.4.16 | |
parent | 6eb50be14ddc5364a251102857907709e24de7d7 (diff) | |
parent | 0c19ec6f2d56a56b63fb9a75d71157cf8c209bc6 (diff) | |
download | xen-e77e33257ff0375e42992547a2660836fafb0d17.tar.gz xen-e77e33257ff0375e42992547a2660836fafb0d17.tar.bz2 xen-e77e33257ff0375e42992547a2660836fafb0d17.zip |
bitkeeper revision 1.50 (3e4f6123M2MCCD_leQUQUtqxzeH6PQ)
Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/local/scratch/kaf24/xeno-sched
Diffstat (limited to 'xen-2.4.16')
-rw-r--r-- | xen-2.4.16/common/domain.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/xen-2.4.16/common/domain.c b/xen-2.4.16/common/domain.c index 3535b45e50..1488ff612c 100644 --- a/xen-2.4.16/common/domain.c +++ b/xen-2.4.16/common/domain.c @@ -578,19 +578,16 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params) } } *dst = '\0'; +//printk("opt_nfsroot=%d,%s XX cmd =: %s\n",opt_nfsroot,opt_nfsroot,virt_startinfo_address->cmd_line); - if ( opt_nfsroot ) - { + if ( strcmp("",opt_nfsroot) ) + { // if nfsroot has been set to something unsigned char boot[150]; unsigned char ipbase[20], nfsserv[20], gateway[20], netmask[20]; unsigned char nfsroot[70]; snprintf(nfsroot, 70, opt_nfsroot, dom); snprintf(boot, 200, -#if 1 " root=/dev/nfs ip=%s:%s:%s:%s::eth0:off nfsroot=%s", -#else - " ro root=/dev/xhda7 ip=%s:%s:%s:%s::eth0:off arfle=%s", -#endif quad_to_str(opt_ipbase + dom, ipbase), quad_to_str(opt_nfsserv, nfsserv), quad_to_str(opt_gateway, gateway), @@ -598,6 +595,18 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params) nfsroot); strcpy(dst, boot); } + else + { + unsigned char boot[150]; + unsigned char ipbase[20], nfsserv[20], gateway[20], netmask[20]; + snprintf(boot, 200, + " ip=%s::%s:%s::eth0:off", + quad_to_str(opt_ipbase + dom, ipbase), + quad_to_str(opt_gateway, gateway), + quad_to_str(opt_netmask, netmask)); + strcpy(dst, boot); + } + /* Reinstate the caller's page tables. */ __write_cr3_counted(pagetable_val(current->mm.pagetable)); |