Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
d2ce6e6a
Commit
d2ce6e6a
authored
Apr 21, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to disk image updating; handle default image case.
parent
a784944a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
apt/APT_Profile.pm.in
apt/APT_Profile.pm.in
+13
-6
No files found.
apt/APT_Profile.pm.in
View file @
d2ce6e6a
...
...
@@ -716,12 +716,12 @@ sub UpdateDiskImage($$@)
#
#
Pull
out
the
disk
url
/
urn
of
the
specified
node
.
#
my
$
diskref
=
GeniXML
::
GetDiskImage
($
node
);
my
$
O
diskref
=
GeniXML
::
GetDiskImage
($
node
);
my
$
image_urn
;
my
$
image_url
;
if
(
defined
($
diskref
))
{
$
image_url
=
GeniXML
::
GetText
(
"url"
,
$
diskref
);
$
image_urn
=
GeniXML
::
GetText
(
"name"
,
$
diskref
);
if
(
defined
($
O
diskref
))
{
$
image_url
=
GeniXML
::
GetText
(
"url"
,
$
O
diskref
);
$
image_urn
=
GeniXML
::
GetText
(
"name"
,
$
O
diskref
);
if
(
defined
($
image_url
)
||
defined
($
image_urn
))
{
#
Watch
for
url
in
the
name
,
flipflop
.
if
(
defined
($
image_urn
)
&&
$
image_urn
=~
/^
http
/)
{
...
...
@@ -735,8 +735,15 @@ sub UpdateDiskImage($$@)
#
foreach
my
$
ref
(
GeniXML
::
FindNodes
(
"n:node"
,
$
rspec
)->
get_nodelist
())
{
my
$
diskref
=
GeniXML
::
GetDiskImage
($
ref
);
next
if
(
!defined($diskref));
#
#
If
the
both
this
node
and
the
original
node
did
not
#
specify
a
disk
image
,
then
we
update
it
.
#
if
(
!defined($diskref)) {
push
(@
nodes
,
$
ref
)
if
(
!defined($Odiskref));
next
;
}
my
$
this_url
=
GeniXML
::
GetText
(
"url"
,
$
diskref
);
my
$
this_urn
=
GeniXML
::
GetText
(
"name"
,
$
diskref
);
next
...
...
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