ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkswap: zap bootbits on regular files 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2010-04-02 12:49:07 +02:00
parent 865deca224
commit 1f7a33f135
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
disk-utils/mkswap.c
View File

@ -372,7 +372,7 @@ check_mount(void) {
}
static void
zap_bootbits(int fd, const char *devname, int force)
zap_bootbits(int fd, const char *devname, int force, int is_blkdev)
{
char *type = NULL;
int whole = 0;
@ -382,7 +382,7 @@ zap_bootbits(int fd, const char *devname, int force)
if (lseek(fd, 0, SEEK_SET) != 0)
die(_("unable to rewind swap-device"));
if (is_whole_disk_fd(fd, devname)) {
if (is_blkdev && is_whole_disk_fd(fd, devname)) {
/* don't zap bootbits on whole disk -- we know nothing
* about bootloaders on the device */
whole = 1;
@ -625,7 +625,7 @@ main(int argc, char ** argv) {
if (check)
check_blocks();
zap_bootbits(DEV, device_name, force);
zap_bootbits(DEV, device_name, force, S_ISBLK(statbuf.st_mode));
p->version = 1;
p->last_page = PAGES-1;