diff options
| author | Karel Zak | 2018-02-16 11:25:22 +0100 |
|---|---|---|
| committer | Karel Zak | 2018-02-16 11:25:22 +0100 |
| commit | 7595bed1898109b34eb072093902071fcb75fea9 (patch) | |
| tree | aeff32e56443932fa20e1f4611ff3e773ca20392 /disk-utils | |
| parent | fsck: coding style cleanup (diff) | |
| parent | tests: use pgrep instead of ps --ppid ... (diff) | |
| download | kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.tar.gz kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.tar.xz kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.zip | |
Merge branch 'maybe-for-v2.32' of https://github.com/rudimeier/util-linux
* 'maybe-for-v2.32' of https://github.com/rudimeier/util-linux:
tests: use pgrep instead of ps --ppid ...
misc: fix typos using codespell
lsns: fix clang compiler warning
tests: add udevadm settle to sfdisk/resize
build-sys: disable bz2 tarball and fix some am warnings
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/fdisk-menu.c | 2 | ||||
| -rw-r--r-- | disk-utils/fsck.cramfs.c | 2 | ||||
| -rw-r--r-- | disk-utils/mkfs.cramfs.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index b8a2e6003..b2cb0d7cb 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -1006,7 +1006,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0, /* C/H/S commands * - * The geometry setting from this dialog is not persistent and maybe reseted by + * The geometry setting from this dialog is not persistent and maybe reset by * fdisk_reset_device_properties() (for example when you create a new disk * label). Note that on command line specified -C/-H/-S setting is persistent * as it's based on fdisk_save_user_geometry(). diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 2a4f75a8c..0d9bdadf7 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -47,7 +47,7 @@ /* We don't use our include/crc32.h, but crc32 from zlib! * - * The zlib implemenation performs pre/post-conditioning. The util-linux + * The zlib implementation performs pre/post-conditioning. The util-linux * imlemenation requires post-conditioning (xor) in the applications. */ #include <zlib.h> diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index 729765078..7104d50af 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -39,7 +39,7 @@ /* We don't use our include/crc32.h, but crc32 from zlib! * - * The zlib implemenation performs pre/post-conditioning. The util-linux + * The zlib implementation performs pre/post-conditioning. The util-linux * imlemenation requires post-conditioning (xor) in the applications. */ #include <zlib.h> |