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
79439d86
Commit
79439d86
authored
Jan 30, 2015
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't print meaningless messages about skipping sectors in imageunzip.
parent
34ff9a66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
clientside/os/imagezip/gpt/gpt_glue.c
clientside/os/imagezip/gpt/gpt_glue.c
+3
-3
clientside/os/imagezip/imagezip.c
clientside/os/imagezip/imagezip.c
+4
-3
clientside/os/imagezip/mbr/mbr.c
clientside/os/imagezip/mbr/mbr.c
+3
-3
No files found.
clientside/os/imagezip/gpt/gpt_glue.c
View file @
79439d86
/*
* Copyright (c) 2000-201
4
University of Utah and the Flux Group.
* Copyright (c) 2000-201
5
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -323,14 +323,14 @@ parse_gpt(int fd, struct iz_slice *parttab, iz_lba *startp, iz_size *sizep,
if
(
losect
>
hdr
->
hdr_lba_start
)
{
size
=
losect
-
hdr
->
hdr_lba_start
;
addskip
(
hdr
->
hdr_lba_start
,
size
);
if
(
dowarn
)
if
(
dowarn
>
1
)
warnx
(
"GPT: Skipping %lu sectors at %lu"
,
size
,
hdr
->
hdr_lba_start
);
}
if
(
hisect
<
hdr
->
hdr_lba_end
+
1
)
{
size
=
hdr
->
hdr_lba_end
+
1
-
hisect
;
addskip
(
hisect
,
size
);
if
(
dowarn
)
if
(
dowarn
>
1
)
warnx
(
"GPT: Skipping %lu sectors at %lu"
,
size
,
hisect
);
}
...
...
clientside/os/imagezip/imagezip.c
View file @
79439d86
/*
* Copyright (c) 2000-201
4
University of Utah and the Flux Group.
* Copyright (c) 2000-201
5
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -960,13 +960,14 @@ read_image(int fd)
int
gotbb
=
0
;
iz_lba
dstart
;
iz_size
dsize
;
int
dowarn
=
debug
?
2
:
0
;
#ifdef WITH_GPT
if
(
!
gotbb
&&
parse_gpt
(
fd
,
parttab
,
&
dstart
,
&
dsize
,
d
ebug
)
==
0
)
if
(
!
gotbb
&&
parse_gpt
(
fd
,
parttab
,
&
dstart
,
&
dsize
,
d
owarn
)
==
0
)
gotbb
=
1
;
#endif
#ifdef WITH_MBR
if
(
!
gotbb
&&
parse_mbr
(
fd
,
parttab
,
&
dstart
,
&
dsize
,
d
ebug
)
==
0
)
if
(
!
gotbb
&&
parse_mbr
(
fd
,
parttab
,
&
dstart
,
&
dsize
,
d
owarn
)
==
0
)
gotbb
=
2
;
#endif
...
...
clientside/os/imagezip/mbr/mbr.c
View file @
79439d86
/*
* Copyright (c) 2000-201
4
University of Utah and the Flux Group.
* Copyright (c) 2000-201
5
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -80,13 +80,13 @@ parse_mbr(int fd, struct iz_slice *parttab, iz_lba *startp, iz_size *sizep,
warnx
(
"MBR: lowest partition start > %u! "
"Only saving first %u sectors."
,
MAGIC_LOSECT
,
MAGIC_LOSECT
);
if
(
dowarn
)
if
(
dowarn
>
1
)
warnx
(
"MBR: skipping %u sectors at %u"
,
losect
-
MAGIC_LOSECT
,
MAGIC_LOSECT
);
}
if
(
hisect
<
dsize
)
{
addskip
(
hisect
,
dsize
-
hisect
);
if
(
dowarn
)
if
(
dowarn
>
1
)
warnx
(
"MBR: skipping %lu sectors at %u"
,
(
unsigned
long
)(
dsize
-
hisect
),
hisect
);
}
...
...
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