d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we fail to open O_RDWR, try opening O_RDONLY, if we use ioctls

Browse Source 
to fiddle the disk we can get away with it.

Try to use DIOCBSDBB to write boot code.
This commit is contained in:
phk 2003-01-26 21:55:43 +00:00
parent 9f690a61a9
commit dd47d81f8c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/bsdlabel/bsdlabel.c
View File

@ -228,6 +228,10 @@ main(int argc, char *argv[])
np = namebuf + strlen(specname) + 1;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
}
if (f < 0 && errno == EBUSY) {
/* lets try to get by with ioctls */
f = open(specname, O_RDONLY);
}
if (f < 0)
err(4, "%s", specname);
@ -378,6 +382,8 @@ writelabel(int f, const char *boot, struct disklabel *lp)
sum += p[i];
p[63] = sum;
#endif
if (ioctl(f, DIOCBSDBB, &boot) == 0)
return (0);
if (write(f, boot, lp->d_bbsize) != (int)lp->d_bbsize) {
warn("write");
return (1);

6
sbin/disklabel/disklabel.c
View File

@ -228,6 +228,10 @@ main(int argc, char *argv[])
np = namebuf + strlen(specname) + 1;
f = open(specname, op == READ ? O_RDONLY : O_RDWR);
}
if (f < 0 && errno == EBUSY) {
/* lets try to get by with ioctls */
f = open(specname, O_RDONLY);
}
if (f < 0)
err(4, "%s", specname);
@ -378,6 +382,8 @@ writelabel(int f, const char *boot, struct disklabel *lp)
sum += p[i];
p[63] = sum;
#endif
if (ioctl(f, DIOCBSDBB, &boot) == 0)
return (0);
if (write(f, boot, lp->d_bbsize) != (int)lp->d_bbsize) {
warn("write");
return (1);