Commit 26d8d946 authored by Leigh B Stoller's avatar Leigh B Stoller

Various little fixes dataset fixes after trying on apt and cloudlab.

parent b944167d
......@@ -210,7 +210,7 @@ if (defined($bsname)) {
# which seems wrong since now I have to figure it out
# in order to check to see if its mounted.
#
if ($bsref ne "SYSVOL") {
if ($bsref->{'BSID'} ne "SYSVOL") {
$device = "/dev/mapper/emulab-${bsname}";
}
$bsref->{'DEVICE'} = $device;
......
......@@ -243,7 +243,7 @@ sub map_bsname($)
# which seems wrong since now I have to figure it out
# in order to check to see if its mounted.
#
if ($bsref ne "SYSVOL") {
if ($bsref->{'BSID'} ne "SYSVOL") {
$device = "/dev/mapper/emulab-${bsname}";
}
$bsref->{'DEVICE'} = $device;
......
......@@ -3532,6 +3532,7 @@ sub getstorageconfig($;$) {
'VOLNAME' => '[-\w]+',
'VOLSIZE' => '\d+',
'DATASET' => '[-\w\/\.:]+',
'SERVER' => '[-\w\.]+',
);
my @ops = ();
......
......@@ -1086,7 +1086,7 @@ sub os_create_storage($$)
my $proxyopt = "";
my $imageid = $href->{'DATASET'};
my $imagepath = $mdev;
my (undef,$ip) = tmccbossinfo();
my $server = $href->{'SERVER'};
if (SHAREDHOST()) {
my $TMNODEID = TMNODEID();
......@@ -1096,7 +1096,9 @@ sub os_create_storage($$)
}
my $command = "$FRISBEE -f -M 128 $proxyopt ".
" -S $ip -B 30 -F $imageid $imagepath";
" -S $server -B 30 -F $imageid $imagepath";
print STDERR "$command\n";
if (mysystem($command)) {
warn("*** $lv: frisbee of dataset to $mdev failed!\n");
......
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