diff options
author | Karel Zak | 2016-11-30 12:43:10 +0100 |
---|---|---|
committer | Karel Zak | 2016-11-30 13:01:33 +0100 |
commit | 35ca51182782193f555fbdcb06bb10766550d017 (patch) | |
tree | e790c87db174462db010ed6c8ea32e7a7506df0f /disk-utils | |
parent | sfdisk: cleanup --dump error messages (diff) | |
download | kernel-qcow2-util-linux-35ca51182782193f555fbdcb06bb10766550d017.tar.gz kernel-qcow2-util-linux-35ca51182782193f555fbdcb06bb10766550d017.tar.xz kernel-qcow2-util-linux-35ca51182782193f555fbdcb06bb10766550d017.zip |
sfdisk: support empty label use-case
By default sfdisk creates partition table when a first partition is
specified, otherwise the device is not modified. This force users to
create at least one partition.
This commit allows to create empty label without partitions if "label:
<name>" header line is specified by script.
The commit also modifies "New situation:" output to list label name
and label identifier.
Addresses: https://github.com/karelzak/util-linux/issues/374
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
-rw-r--r-- | disk-utils/fdisk-list.c | 23 | ||||
-rw-r--r-- | disk-utils/fdisk-list.h | 1 | ||||
-rw-r--r-- | disk-utils/sfdisk.8 | 18 | ||||
-rw-r--r-- | disk-utils/sfdisk.c | 17 |
4 files changed, 50 insertions, 9 deletions
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c index e6b2033e7..c9560f42b 100644 --- a/disk-utils/fdisk-list.c +++ b/disk-utils/fdisk-list.c @@ -34,10 +34,23 @@ static int is_ide_cdrom_or_tape(char *device) return ret; } +void list_disk_identifier(struct fdisk_context *cxt) +{ + struct fdisk_label *lb = fdisk_get_label(cxt, NULL); + char *id = NULL; + + if (fdisk_has_label(cxt)) + fdisk_info(cxt, _("Disklabel type: %s"), + fdisk_label_get_name(lb)); + + if (!fdisk_is_details(cxt) && fdisk_get_disklabel_id(cxt, &id) == 0 && id) { + fdisk_info(cxt, _("Disk identifier: %s"), id); + free(id); + } +} void list_disk_geometry(struct fdisk_context *cxt) { - char *id = NULL; struct fdisk_label *lb = fdisk_get_label(cxt, NULL); uint64_t bytes = fdisk_get_nsectors(cxt) * fdisk_get_sector_size(cxt); char *strsz = size_to_human_string(SIZE_SUFFIX_SPACE @@ -71,14 +84,8 @@ void list_disk_geometry(struct fdisk_context *cxt) if (fdisk_get_alignment_offset(cxt)) fdisk_info(cxt, _("Alignment offset: %lu bytes"), fdisk_get_alignment_offset(cxt)); - if (fdisk_has_label(cxt)) - fdisk_info(cxt, _("Disklabel type: %s"), - fdisk_label_get_name(lb)); - if (!fdisk_is_details(cxt) && fdisk_get_disklabel_id(cxt, &id) == 0 && id) { - fdisk_info(cxt, _("Disk identifier: %s"), id); - free(id); - } + list_disk_identifier(cxt); } void list_disklabel(struct fdisk_context *cxt) diff --git a/disk-utils/fdisk-list.h b/disk-utils/fdisk-list.h index eddab92ec..4ed5c256b 100644 --- a/disk-utils/fdisk-list.h +++ b/disk-utils/fdisk-list.h @@ -2,6 +2,7 @@ #define UTIL_LINUX_FDISK_LIST_H extern void list_disklabel(struct fdisk_context *cxt); +extern void list_disk_identifier(struct fdisk_context *cxt); extern void list_disk_geometry(struct fdisk_context *cxt); extern void list_freespace(struct fdisk_context *cxt); diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8 index fcde8726b..efe4a86bf 100644 --- a/disk-utils/sfdisk.8 +++ b/disk-utils/sfdisk.8 @@ -212,7 +212,10 @@ Deprecated option. Only the sector unit is supported. .BR \-X , " \-\-label " \fItype Specify the disk label type (e.g. \fBdos\fR, \fBgpt\fR, ...). If this option is not given, then \fBsfdisk\fR defaults to the existing label, but if there -is no label on the device yet, then the type defaults to \fBdos\fR. +is no label on the device yet, then the type defaults to \fBdos\fR. The default +or the current label may be overwritten by the "label: <name>" script header +line. The option \fB\-\-label\fR does not force \fBsfdisk\fR to create empty +disk label (see the \fBEMPTY DISK LABEL\fR section below). .TP .BR \-Y , " \-\-label\-nested " \fItype Force editing of a nested disk label. The primary disk label has to exist already. @@ -404,6 +407,19 @@ For backward compatibility the \fBId=\fR field has the same meaning. .RE .RE +.SH "EMPTY DISK LABEL" +.B sfdisk +does not create partition table without partitions by default. The lines with +partitions are expected in the script by default. The empty partition table has +to be explicitly requested by "label: <name>" script header line without any +partitions lines. For example: +.RS +.sp +.B "echo 'label: gpt' | sfdisk /dev/sdb" +.sp +.RE +creates empty GPT partition table. Note that the \fB\-\-append\fR disables this feature. + .SH "BACKING UP THE PARTITION TABLE" It is recommended to save the layout of your devices. .B sfdisk diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 10307ad14..2d6597434 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1766,8 +1766,25 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) } } while (1); + /* create empty disk label if label, but no partition specified */ + if (rc == SFDISK_DONE_EOF && created == 0 + && fdisk_script_has_force_label(dp) == 1 + && fdisk_table_get_nents(tb) == 0 + && fdisk_script_get_header(dp, "label")) { + + int xrc = fdisk_apply_script_headers(sf->cxt, dp); + created = !xrc; + if (xrc) { + fdisk_warnx(sf->cxt, _( + "Failed to apply script headers, " + "disk label not created.")); + rc = SFDISK_DONE_ABORT; + } + } + if (!sf->quiet && rc != SFDISK_DONE_ABORT) { fdisk_info(sf->cxt, _("\nNew situation:")); + list_disk_identifier(sf->cxt); list_disklabel(sf->cxt); } |