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
3ce528da
Commit
3ce528da
authored
Jan 10, 2013
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Watch for a null osfeature list and skip it.
parent
51763daa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
utils/clone_image.in
utils/clone_image.in
+4
-2
No files found.
utils/clone_image.in
View file @
3ce528da
#!/usr/bin/perl -w
#
# Copyright (c) 2000-201
2
University of Utah and the Flux Group.
# Copyright (c) 2000-201
3
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -229,7 +229,6 @@ my %xmlfields =
"
OS
"
=>
$base_osinfo
->
OS
(),
"
version
"
=>
$base_osinfo
->
version
(),
"
path
"
=>
"
$PROJROOT
/
$pid
/images/
${imagename}
.ndz
",
"
osfeatures
",
=>
$base_osinfo
->
osfeatures
(),
"
op_mode
",
=>
$base_osinfo
->
op_mode
(),
"
global
"
=>
(
defined
(
$global
)
?
(
$global
?
1
:
0
)
:
$base_osinfo
->
shared
()),
...
...
@@ -237,6 +236,9 @@ my %xmlfields =
);
$xmlfields
{"
reboot_waittime
"}
=
$base_osinfo
->
reboot_waittime
()
if
(
defined
(
$base_osinfo
->
reboot_waittime
()));
$xmlfields
{"
osfeatures
"}
=
$base_osinfo
->
osfeatures
()
if
(
defined
(
$base_osinfo
->
osfeatures
())
&&
$base_osinfo
->
osfeatures
()
ne
"");
if
(
defined
(
$base_image
))
{
$xmlfields
{"
mbr_version
"}
=
$base_image
->
mbr_version
();
...
...
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