summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fsck.cramfs.c1
-rw-r--r--disk-utils/partx.85
-rw-r--r--disk-utils/partx.c3
-rw-r--r--disk-utils/sfdisk.83
4 files changed, 7 insertions, 5 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index e1b964b64..a81995180 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -416,7 +416,6 @@ static void do_uncompress(char *path, int outfd, unsigned long offset,
curr = next;
} while (size);
}
-#include <utime.h>
static void change_file_status(char *path, struct cramfs_inode *i)
{
const struct timeval epoch[] = { {0,0}, {0,0} };
diff --git a/disk-utils/partx.8 b/disk-utils/partx.8
index 223f20918..d6ff52f08 100644
--- a/disk-utils/partx.8
+++ b/disk-utils/partx.8
@@ -53,7 +53,10 @@ Add the specified partitions, or read the disk and add all partitions.
Print the SIZE column in bytes rather than in human-readable format.
.TP
.BR \-d , " \-\-delete"
-Delete the specified partitions or all partitions.
+Delete the specified partitions or all partitions. It is not error to
+remove non-existing partitions, so this option is possible to use together with
+large \fB\-\-nr\fR ranges without care about the current partitions set on
+the device.
.TP
.BR \-g , " \-\-noheadings"
Do not print a header line with \fB\-\-show\fR or \fB\-\-raw\fR.
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 949278eb7..e1f6b8f9e 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -328,8 +328,7 @@ static int del_parts(int fd, const char *device, dev_t devno,
}
for (i = lower; i <= upper; i++) {
- rc = partx_del_partition(fd, i);
- if (rc == 0) {
+ if (partx_del_partition(fd, i) == 0) {
if (verbose)
printf(_("%s: partition #%d removed\n"), device, i);
continue;
diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8
index ff54760ca..c7630bb37 100644
--- a/disk-utils/sfdisk.8
+++ b/disk-utils/sfdisk.8
@@ -462,7 +462,8 @@ GPT partition UUID.
GPT partition name.
.TP
.BI type= code
-A hexadecimal number (without 0x) for an MBR partition, or a GUID for a GPT partition.
+A hexadecimal number (without 0x) for an MBR partition, a GUID for a GPT partition,
+or a shortcut as for unnamed-fields format.
For backward compatibility the \fBId=\fR field has the same meaning.
.RE
.RE