Skip to content
GitLab
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
76b0b04a
Commit
76b0b04a
authored
Apr 16, 2014
by
Mike Hibler
Browse files
Resurrect code to handle FreeBSD partition without a disklabel.
parent
b62a4b3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
clientside/os/imagezip/ffs/ffs.c
View file @
76b0b04a
/*
* Copyright (c) 2000-201
3
University of Utah and the Flux Group.
* Copyright (c) 2000-201
4
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -106,7 +106,7 @@ read_bsdslice(int slice, int bsdtype, u_int32_t start, u_int32_t size,
*/
if
(
dlabel
.
label
.
d_magic
!=
DISKMAGIC
||
dlabel
.
label
.
d_magic2
!=
DISKMAGIC
)
{
#if
0
/* not needed, a fake disklabel is created by the kernel */
#if
def linux
/* not needed
in BSD
, a fake disklabel is created by the kernel */
/*
* If we were forced with the bsdfs option,
* assume this is a single partition disk like a
...
...
@@ -122,7 +122,7 @@ read_bsdslice(int slice, int bsdtype, u_int32_t start, u_int32_t size,
return
read_bsdpartition
(
infd
,
&
dlabel
.
label
,
0
);
}
#endif
warnx
(
"Wrong magic number i
s
BSD disklabel"
);
warnx
(
"Wrong magic number i
n
BSD disklabel"
);
return
1
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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