Commit cadc2e6a authored by Mike Hibler's avatar Mike Hibler

Xen vnode fixes.

Fix some bitrot in the Linux code: fixup /etc/fstab to have an old-style
LABEL=/ rather than a UUID.

Don't allocate more than 768MB of memory to a FreeBSD 8 vnode as it panics
otherwise.
parent b6de1d3a
......@@ -490,6 +490,11 @@ sub vnodeCreate($$$)
if (defined($ramdisk));
addConfig($vmid, "disk = ['phy:$vndisk,$vdisk,w']", 2);
# XXX memory of over 768MB causes panic as of 8.2
if ($os eq "FreeBSD" && memoryPerVnode > 768) {
addConfig($vmid, "memory = 768", 1);
}
if ($os eq "FreeBSD") {
addConfig($vmid, "extra = 'boot_verbose=1'", 2);
addConfig($vmid, "extra += ',vfs.root.mountfrom=ufs:/dev/da0a'", 2);
......@@ -1032,6 +1037,9 @@ sub disk_hacks($)
# don't start dhcpd in the VM
unlink("$path/etc/dhcpd.conf");
# fixup fstab: change UUID=blah to LABEL=/
system("sed -i.bak -e 's/UUID=[0-9a-f-]*/LABEL=\\//' $path/etc/fstab");
# enable the correct device for console
system("sed -i.bak -e 's/xvc0/console/' $path/etc/inittab");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment