Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
604120cb
Commit
604120cb
authored
Nov 14, 2014
by
Leigh B Stoller
Browse files
Minor bug fixes.
parent
5c44b34e
Changes
3
Hide whitespace changes
Inline
Side-by-side
utils/clone_image.in
View file @
604120cb
...
...
@@ -57,7 +57,7 @@ sub usage()
"
-w Wait for image to be created
\n
");
exit
(
-
1
);
}
my
$optlist
=
"
densg:wFr
";
my
$optlist
=
"
densg:wFr
:
";
my
$debug
=
0
;
my
$wholedisk
=
0
;
my
$impotent
=
0
;
...
...
www/aptui/js/status.js
View file @
604120cb
...
...
@@ -668,8 +668,10 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
function
ShowTopo
(
uuid
)
{
var
callback
=
function
(
json
)
{
#
console
.
info
(
json
);
if
(
$
(
"
#manifest_textarea
"
).
length
)
{
$
(
"
#manifest_textarea
"
).
htm
l
(
json
.
value
);
$
(
"
#manifest_textarea
"
).
va
l
(
json
.
value
);
$
(
"
#manifest_textarea
"
).
css
(
"
height
"
,
"
300
"
);
}
...
...
www/aptui/status.ajax
View file @
604120cb
...
...
@@ -126,7 +126,7 @@ function Do_TerminateInstance()
return
;
}
if
(
$webtask
&&
$webtask
->
exited
())
{
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Data
(
"output"
));
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Value
(
"output"
));
$webtask
->
Delete
();
}
else
{
...
...
@@ -353,7 +353,7 @@ function Do_ConsoleURL()
return
;
}
if
(
$webtask
)
{
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Data
(
"output"
));
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Value
(
"output"
));
$webtask
->
Delete
();
}
else
{
...
...
@@ -414,6 +414,7 @@ function Do_Snapshot()
$webtask
=
WebTask
::
Lookup
(
$webtask_id
);
if
(
$retval
!=
0
)
{
SUEXECERROR
(
SUEXEC_ACTION_CONTINUE
);
if
(
$retval
<
0
)
{
SPITAJAX_ERROR
(
-
11
,
"Internal error, cannot proceed."
);
# Notify tbops.
...
...
@@ -421,7 +422,7 @@ function Do_Snapshot()
return
;
}
if
(
$webtask
)
{
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Data
(
"output"
));
SPITAJAX_ERROR
(
1
,
$webtask
->
Task
Value
(
"output"
));
$webtask
->
Delete
();
}
else
{
...
...
Write
Preview
Supports
Markdown
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