Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
26d8d946
Commit
26d8d946
authored
Mar 06, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various little fixes dataset fixes after trying on apt and cloudlab.
parent
b944167d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
clientside/os/create-image
clientside/os/create-image
+1
-1
clientside/os/create-versioned-image
clientside/os/create-versioned-image
+1
-1
clientside/tmcc/common/libsetup.pm
clientside/tmcc/common/libsetup.pm
+1
-0
clientside/tmcc/linux/liblocstorage.pm
clientside/tmcc/linux/liblocstorage.pm
+4
-2
No files found.
clientside/os/create-image
View file @
26d8d946
...
...
@@ -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
;
...
...
clientside/os/create-versioned-image
View file @
26d8d946
...
...
@@ -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
;
...
...
clientside/tmcc/common/libsetup.pm
View file @
26d8d946
...
...
@@ -3532,6 +3532,7 @@ sub getstorageconfig($;$) {
'
VOLNAME
'
=>
'
[-\w]+
',
'
VOLSIZE
'
=>
'
\d+
',
'
DATASET
'
=>
'
[-\w\/\.:]+
',
'
SERVER
'
=>
'
[-\w\.]+
',
);
my
@ops
=
();
...
...
clientside/tmcc/linux/liblocstorage.pm
View file @
26d8d946
...
...
@@ -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
");
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment