gmane.linux.utilities.util-linux-ng

Portability patches for GNU/Hurd

Thomas Schwinge — 2012-05-25T18:13:40

Hi!

The subject says is all.  :-)


Grüße,
 Thomas

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] kill: Check the correct variable when configuring.

Thomas Schwinge — 2012-05-25T18:11:22

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a1b1e9b..eb67ada 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -976,7 +976,7 < at >< at > AC_ARG_ENABLE([kill],
 )
 UL_BUILD_INIT([kill])
 UL_REQUIRES_LINUX([kill])
-AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
+AM_CONDITIONAL(BUILD_KILL, test "x$build_kill" = xyes)
 
 
 AC_ARG_ENABLE([last],

[PULL] su

Ludwig Nussel — 2012-05-24T12:58:01

Hi,

coreutils isn't really interested in maintaining su anymore.
Distributions have to add custom patches to fix bugs and add
features. The worst offender is probably the pam patch. Fortunately
we managed to sync the patch between openSUSE and Fedora meanwhile.
Over time the risk that the patches divert again increases though.
Since util-linux now contains a common login program it looks like a
good new home for su too.

To integrate su into util-linux I've extracted the history of the su
program until the last GPLv2 version (they've changed to GPLv3
meanwhile) from coreutils' git and merged it with util-linux.
Then I've added the patches used in Fedora and openSUSE and fixed the
files to actually build.

You can find the result in branch su-v1 (ff6b15d) at
git-9UaJU3cA/F/QT0dZR+AlfA< at >public.gmane.org:lnussel/util-linux.git

I've also filed a pull request on github:
https://github.com/karelzak/util-linux/pull/10

Originally I had planned to implement separate tty allocation for
the child program on top of th

[PATCH 1/3] logger: avoid explicit fclose(stdout)

Dave Reisner — 2012-05-23T20:35:58

This is done for us via an atexit hook since c05a80ca6385b8. Avoids a
useless 'Write error' on exit whenever invoking the tool.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/logger.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 067272a..19b4c47 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -248,8 +248,6 < at >< at > main(int argc, char **argv) {
 else
 LogSock = myopenlog(usock);
 
-(void) fclose(stdout);

[PATCH] misc-utils: cleanup unused strings.h includes

maximilian attems — 2012-05-22T14:33:23

Noticed on klibc building.

Signed-off-by: maximilian attems <max-U9r9yeDMy7A< at >public.gmane.org>
---
 misc-utils/kill.c   |    1 -
 misc-utils/logger.c |    1 -
 misc-utils/namei.c  |    1 -
 3 files changed, 3 deletions(-)

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index da7c8ab..c592f52 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
< at >< at > -45,7 +45,6 < at >< at >
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>/* for isdigit() */
 #include <unistd.h>
 #include <signal.h>
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index db3469c..9805a7d 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -43,7 +43,6 < at >< at >
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index b15d4f7..fc1689d 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
< at >< at > -24,7 +24,6 < at >< at >
 #include <unistd.h>
 #inc

[PATCH] include: [c.h] protect container_of

maximilian attems — 2012-05-22T14:20:42

fixes lots of warning noise:
../../../include/c.h:112:0: warning: "container_of" redefined [enabled
by default]
/usr/lib/klibc/include/stddef.h:52:0: note: this is the location of the
previous definition

Signed-off-by: maximilian attems <max-U9r9yeDMy7A< at >public.gmane.org>
---
 include/c.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/c.h b/include/c.h
index b6d8ced..8c8db73 100644
--- a/include/c.h
+++ b/include/c.h
< at >< at > -109,9 +109,11 < at >< at >
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
+#ifndef container_of
 #define container_of(ptr, type, member) ({                       \
 const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
 (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
 
 #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 # ifdef HAVE___PROGNAME

[PATCH 5/6] fdisk: introduce fdisk context

Davidlohr Bueso — 2012-05-20T16:11:36

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

This is the first patch that adds the initial parts of the new fdisk internal API. Two functions are created to both init and deinit the fdisk
context. Only the device's descriptor and path are added as a start and these are replaced throughout fdisk.c and label specific code.

All logic that opens the file does it with fdisk_new_context_from_filename(), and this enforces always opening the device with rw, then, if
unsuccessful, with read-only. This changes the current logic that opens the device with certain permissions depending on the user given options.
For example, -l opens the device read-only.

This patch passed regression tests and local modifications for sgi/dos/sun disk labels.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/Makefile.am     |    1 +
 fdisk/fdisk.c         |   82 ++++++++++++++++++++++--------------------------
 fdisk/fdisk.h         |    9 +++++
 fdisk/fdiskbsdlabel.c |   44 +++++++++++++-----

[PATCH 6/6] fdisk: add debug support

Davidlohr Bueso — 2012-05-20T16:11:39

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Based on libmnt, this patch adds basic debugging support for fdisk. Currently only CONTEXT is debugged, yet keeps exact functionality
as libmnt/libblkid.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |    2 ++
 fdisk/fdisk.h |   27 +++++++++++++++++++++++++++
 fdisk/utils.c |   33 ++++++++++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 400e682..9b91fa0 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2168,6 +2168,8 < at >< at > int main(int argc, char **argv)
 }
 }
 
+fdisk_init_debug(0);
+
 if (user_set_sector_size && argc-optind != 1)
 printf(_("Warning: the -b (set sector size) option should"
  " be used with one specified device\n"));
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index c43517c..2471541 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
< at >< at > -32,6 +32,33 < at >< at >
 #define cround(n)(display_in_cyl_units ? ((n)/units_per_secto

[PATCH 4/6] fdisk: use BSD label header

Davidlohr Bueso — 2012-05-20T16:11:33

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Move bsd specific function definitions into its own header file and include it in fdisk code.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c         |    1 +
 fdisk/fdisk.h         |    6 ------
 fdisk/fdiskbsdlabel.h |    5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 08afb45..b6c5758 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -39,6 +39,7 < at >< at >
 #include "fdiskaixlabel.h"
 #include "fdiskmaclabel.h"
 #include "fdiskdoslabel.h"
+#include "fdiskbsdlabel.h"
 
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 0dafbf8..82888dc 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
< at >< at > -185,9 +185,3 < at >< at > static inline int is_cleared_partition(struct partition *p)
  p->sys_ind || p->end_head || p->end_sector || p->end_cyl ||
  get_start_sect(p) || get_nr_sects(p));
 }
-
-/* prototypes for fdiskbsdlabel.

[PATCH 3/6] fdisk: refactor -s option

Davidlohr Bueso — 2012-05-20T16:11:29

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 9387795..08afb45 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2095,10 +2095,22 < at >< at > static void command_prompt(void)
 }
 }
 
+static unsigned long long get_dev_sz(char *dev)
+{
+int fd;
+unsigned long long size;
+
+if ((fd = open(dev, O_RDONLY)) < 0)
+err(EXIT_FAILURE, _("unable to open %s"), dev);
+if (blkdev_get_sectors(fd, &size) == -1)
+fatal(ioctl_error);
+close(fd);
+return size/2;
+}
+
 int main(int argc, char **argv)
 {
-int j, c;
-int optl = 0, opts = 0;
+int c, optl = 0, opts = 0;
 
 setlocale(LC_ALL, "");
 bindtextdomain(PACKAGE, LOCALEDIR);
< at >< at > -2182,27 +2194,18 < at >< at > int main(int argc, char **argv)
 }
 
 if (opts) {
-unsigned long long size;
-
-nowarn = 1;
-
-opts = argc - optind;

[PATCH 2/6] fdisk: remove bogus statement

Davidlohr Bueso — 2012-05-20T16:11:26

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

usage() does not return, also move the help option handling to the bottom of the switch.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 2f3c119..9387795 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2095,8 +2095,8 < at >< at > static void command_prompt(void)
 }
 }
 
-int
-main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
 int j, c;
 int optl = 0, opts = 0;
 
< at >< at > -2130,9 +2130,6 < at >< at > main(int argc, char **argv) {
 else if (optarg && strcmp(optarg, "=nondos"))
 usage(stderr);
 break;
-case 'h':
-usage(stdout);
-break;
 case 'H':
 user_heads = strtou32_or_err(optarg, _("invalid heads argument"));
 if (user_heads > 256)
< at >< at > -2160,6 +2157,8 < at >< at > main(int argc, char **argv) {
 case 'v':
 printf(UTIL_LINUX_VERSION);
 return EXIT_SUCCESS;
+case 'h':
+usage(

[PATCH 1/6] fdisk: add an quit/exit handling function

Davidlohr Bueso — 2012-05-20T16:11:21

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 3f83297..2f3c119 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -1810,6 +1810,13 < at >< at > move_begin(int i) {
 }
 }
 
+static void __attribute__ ((__noreturn__)) handle_quit(void)
+{
+close(fd);
+printf("\n");
+exit(EXIT_SUCCESS);
+}
+
 static void
 expert_command_prompt(void)
 {
< at >< at > -1875,9 +1882,7 < at >< at > expert_command_prompt(void)
 x_list_table(0);
 break;
 case 'q':
-close(fd);
-printf("\n");
-exit(0);
+handle_quit();
 case 'r':
 return;
 case 's':
< at >< at > -2064,9 +2069,7 < at >< at > static void command_prompt(void)
 list_table(0);
 break;
 case 'q':
-close(fd);
-printf("\n");
-exit(0);
+handle_quit();
 case 's':
 create_sunlabel();
 break;

[PATCH 1/3] findmnt: reference correct manual section

Dave Reisner — 2012-05-20T00:39:19

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/findmnt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 1d34696..9005483 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
< at >< at > -1005,7 +1005,7 < at >< at > static void __attribute__((__noreturn__)) usage(FILE *out)
 for (i = 0; i < FINDMNT_NCOLUMNS; i++)
 fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-fprintf(out, USAGE_MAN_TAIL("findmnt(1)"));
+fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));
 
 exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

[PATCH 1/4] last: use min() from c.h

Petr Uzel — 2012-05-17T07:41:06

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 login-utils/last.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/login-utils/last.c b/login-utils/last.c
index 34558bb..62fc55c 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
< at >< at > -72,15 +72,11 < at >< at > static struct utmputmpbuf;
 #defineLMAX(int)sizeof(utmpbuf.ut_line)/* size of utmp tty field */
 #defineNMAX(int)sizeof(utmpbuf.ut_name)/* size of utmp name field */
 
-#ifndef MIN
-#define MIN(a,b)(((a) < (b)) ? (a) : (b))
-#endif

[PATCH 1/2] blkid: use symbolic exit code

Petr Uzel — 2012-05-16T08:38:31

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 misc-utils/blkid.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 8007840..4f7050f 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
< at >< at > -720,7 +720,7 < at >< at > int main(int argc, char **argv)
 
 while (blkid_superblocks_get_name(idx++, &name, NULL) == 0)
 printf("%s\n", name);
-exit(0);
+exit(EXIT_SUCCESS);
 }
 case 'o':
 if (!strcmp(optarg, "value"))

[PATCH 1/4] include: rename writeall.h to all-io.h

Petr Uzel — 2012-05-15T08:49:01

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 disk-utils/fsck.minix.c |    2 +-
 disk-utils/mkfs.minix.c |    2 +-
 disk-utils/mkswap.c     |    2 +-
 disk-utils/swaplabel.c  |    2 +-
 include/Makefile.am     |    2 +-
 include/all-io.h        |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 include/writeall.h      |   47 -----------------------------------------------
 lib/path.c              |    2 +-
 libblkid/src/probe.c    |    2 +-
 login-utils/login.c     |    2 +-
 misc-utils/uuidd.c      |    2 +-
 misc-utils/wipefs.c     |    2 +-
 sys-utils/dmesg.c       |    2 +-
 term-utils/agetty.c     |    2 +-
 text-utils/pg.c         |    2 +-
 15 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 include/all-io.h
 delete mode 100644 include/writeall.h

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 139ab7a..5e56e83 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
< at >< at > -109,7 +109,7 < at >< at >
 #include "pathnames.h"
 #include

[PATCH 1/2] lib/tt: make get_terminal_width available externally

Petr Uzel — 2012-05-14T07:51:57

Also, rename get_terminal_width() to tt_get_terminal_width()
to match naming convention of other exported functions.

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 include/tt.h |    1 +
 lib/tt.c     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/tt.h b/include/tt.h
index 36d3bb2..9aa04db 100644
--- a/include/tt.h
+++ b/include/tt.h
< at >< at > -86,5 +86,6 < at >< at > extern struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent);
 
 extern int tt_line_set_data(struct tt_line *ln, int colnum, const char *data);
 extern int tt_line_set_userdata(struct tt_line *ln, void *data);
+extern int tt_get_terminal_width(void);
 
 #endif /* UTIL_LINUX_TT_H */
diff --git a/lib/tt.c b/lib/tt.c
index 1b5fbac..af3a34e 100644
--- a/lib/tt.c
+++ b/lib/tt.c
< at >< at > -253,7 +253,7 < at >< at > int tt_line_set_data(struct tt_line *ln, int colnum, const char *data)
 return 0;
 }
 
-static int get_terminal_width(void)
+int tt_get_terminal_width(void)
 {
 #ifdef TIOCGSIZE
 struct ttysizet_w

[PATCH] mangle: check for end of string on every iteration

Dave Reisner — 2012-05-13T19:14:49

Checking for the null byte at the end of the string only conditionally
leads to segfaults, evidenced by mount helpers crashing on writes to
/run/mount/utab. Simply check for the null on each iteration, and append
a null byte to the mangled string before breaking.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 lib/mangle.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/mangle.c b/lib/mangle.c
index e1b4814..656918c 100644
--- a/lib/mangle.c
+++ b/lib/mangle.c
< at >< at > -31,16 +31,17 < at >< at > char *mangle(const char *s)
 if (!sp)
 return NULL;
 while(1) {
+if (!*s) {
+*sp = '\0';
+break;
+}
 if (is_unwanted_char(*s)) {
 *sp++ = '\\';
 *sp++ = '0' + ((*s & 0300) >> 6);
 *sp++ = '0' + ((*s & 070) >> 3);
 *sp++ = '0' + (*s & 07);
-} else {
+} else
 *sp++ = *s;
-if (!*s)
-break;
-}
 s++;
 }
 return ss;

[PATCH] rev.1: mention tac(1) in 'SEE ALSO' section

Petr Uzel — 2012-05-13T11:57:46

Cc: James R. Van Zandt" <jrv-8fiUuRrzOP0dnm+yROfE0A< at >public.gmane.org>
From: James R. Van Zandt" <jrv-8fiUuRrzOP0dnm+yROfE0A< at >public.gmane.org>
Addresses: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568709

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 text-utils/rev.1 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/text-utils/rev.1 b/text-utils/rev.1
index 5917747..b9b5f48 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
< at >< at > -56,3 +56,5 < at >< at > The rev command is part of the util-linux package and is available from
 .UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
 Linux Kernel Archive
 .UE .
+.SH SEE ALSO
+.BR tac (1)

[PATCH 1/3] mkswap: use is_mounted() instead of check_mount()

Petr Uzel — 2012-05-13T11:44:30

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 disk-utils/Makefile.am |    1 +
 disk-utils/mkswap.c    |   26 ++------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 09dfa99..ecff70e 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
< at >< at > -47,6 +47,7 < at >< at > swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
 
 mkswap_SOURCES = \
 mkswap.c \
+$(top_srcdir)/lib/ismounted.c \
 $(top_srcdir)/lib/strutils.c \
 $(top_srcdir)/lib/wholedisk.c \
 $(utils_common)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 51a0c89..c7dedd7 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
< at >< at > -58,6 +58,7 < at >< at >
 #include "xalloc.h"
 #include "c.h"
 #include "closestream.h"
+#include "ismounted.h"
 
 #ifdef HAVE_LIBUUID
 # include <uuid.h>
< at >< at > -348,29 +349,6 < at >< at > get_size(const char *file)
 return size;
 }
 
-/*
- * Check to make certain that our new filesystem won't be created on
- * an already

[PATCH] lsblk.8: improve wording

Petr Uzel — 2012-05-13T09:08:20

Cc: Regid Ichira <regid23-/E1597aS9LQAvxtiuMwx3w< at >public.gmane.org>
From: Regid Ichira <regid23-/E1597aS9LQAvxtiuMwx3w< at >public.gmane.org>
Addresses: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672702

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 misc-utils/lsblk.8 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 21d5838..79173da 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
< at >< at > -66,8 +66,8 < at >< at > This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,RO
 .IP "\fB\-V, \-\-version\fP"
 Output version information and exit.
 .SH NOTES
-For the partitions are some information (e.g. queue attributes) inherited from
-parental device.
+For partitions, some information (e.g. queue attributes) is inherited from the
+parent device.
 
 The
 .B lsblk