Merge branch 'master', remote-tracking branch 'upstream/master'

libmount: allow to convert /dev/loopN to backing filename

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: cleanup return codes in mount sample

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: add support for mount -a

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: fix fstype caching

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: rename in cache.c

 * don't use mnt_ prefix for static functions

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: clean up cache.c

 * rename fields in the cache entry to be more readable...

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: add generic function to read table for context

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: allow to set parser callback to context

Signed-off-by: Karel Zak <kzak@redhat.com>

mountpoint: add new command

This is libmount based re-implementation of the mountpoint(1) command.
The original implementation is maintained in sysvinit suite.

The mountpoint(1) in util-linux is not enabled by default (for now) --
use --enable-mountpoint to enable the util.

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>

blkid: list all known filesystems/RAIDs (add -k option)

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: add debug message

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>

lib: [procutils.c] improve robustness

Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: move BUILD_SCHEDUTILS to top-level Makefile

Signed-off-by: Karel Zak <kzak@redhat.com>

lib: [linux_version.c] simplify version parsing

Signed-off-by: Karel Zak <kzak@redhat.com>

lscpu: detect VMware hypervisor

Add detection of VMware.
Tested on VMware Workstation 7.1.4

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

misc: hurd build fixes

* Make blkdev_is_misaligned return 0 when BLKALIGNOFF is not available.
* Make procutils.c include c.h to get a PATH_MAX replacement.
* Provide agetty.c USE_SYSLOG, DEFAULT_VCTERM and DEFAULT_STERM
  defaults for Hurd.
* Make agetty.c only deal with OFDEL, XCASE and VSWTCH if they are
  available.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

mount: add ufstype=ufs2 to mount.8

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=691338
Signed-off-by: Karel Zak <kzak@redhat.com>

login: fix typos in man page

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=675181
Signed-off-by: Karel Zak <kzak@redhat.com>

fsck.minix: remove unused variables

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: don't ignore swap UUID if only first byte is zero

[kzak@redhat.com: - remove memcmp(zero_uuid, ...), library already
                    checks for empty UUIDs]

Signed-off-by: "Richard W.M. Jones" <rjones@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

mkfs.minix: add fs version options

Like the original minix mkfs, add the -1 and -2 argument options to specify the
version of the filesystem to create.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

mkfs.minix: standardize superblock attribute settings

Because of the dependence of fs_version, some superblock attributes will vary,
so simplify the logic of assigning values to maxsize and the amount of zones
related to each filesystem, thus making setup_tables() more readable.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

test_sysinfo: fix printf format

Signed-off-by: Karel Zak <kzak@redhat.com>

hwclock: Don't use asm/io.h if sys/io.h can't be found

[kzak@redhat.com: - check for obsolete asm/io.h in configure.ac]

Signed-off-by: Josiah Worcester <josiahw@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

test_sysinfo: Use CHAR_BIT*sizeof(void*) instead of __WORDSIZE.

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

lib: [tt.c] Fix mbs_width macro for systems without WIDECHAR

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

checktty: Use NGROUPS_MAX instead of NGROUPS

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

fsck, checktty, flock: Use more portable includes.

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

fdisk, display, hexdump.h: Use standard C types instead of u_int, u_char, u_long, etc.

Signed-off-by: Josiah Worcester <josiahw@gmail.com>

libmount: add mount support for loopdevs

Signed-off-by: Karel Zak <kzak@redhat.com>

lib: [loopdev.c] cleanup flags usage

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: minor changes in sample program

Signed-off-by: Karel Zak <kzak@redhat.com>

tests: update blkid MD test

Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: use top-level directory for libblkid rather than shlibs/blkid

Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: use top-level directory for libmount rather than shlibs/mount

Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: use top-level directory for libuuid rather than shlibs/uuid

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>

mkfs.minix: use inode wrappers

Use a common function for creating the root and bad inode, without worring
about the fs version.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

docs: update DEPRECATED file

Signed-off-by: Karel Zak <kzak@redhat.com>

simpleinit: remove this deprecated set of utils

Signed-off-by: Karel Zak <kzak@redhat.com>

mount.8: remove reprecated bh/nobh options from the manual page

Bh and nobh mount option has been deprecated in ext4
(206f7ab4f49a2021fcb8687f25395be77711ddee) and in ext3
(4c4d3901225518ed1a4c938ba15ba09842a00770)
so remove those options from documentation.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>

minix: fix warning

This patch fixes an unused variable warning.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

fstrim, setarch: replace error() with err()

This should improve a bit the portability as error() is a GNU extension and
util-linux provides fallbacks for err.h functions.

Fix compilation with icc, broken due to a reference to `__builtin_va_arg_pack'
in error.h using the -gcc default option.

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

tests: add lscpu dumps from three Dell's & a Xen

x86_64-dell_poweredgeR610
Ubuntu 11.04 kernel 2.6.38-8

x86_64-dell_poweredge1950
Red Hat EL 4.5 kernel 2.6.9-55.ELsmp

x86_64-dell_e4310
Red Hat EL 5.3 kernel 2.6.18-194.17.4.el5

x86_64-el5xen
Red Hat EL 5.6 kernel 2.6.18-238.el5xen

Signed-off-by: Sami Kerola <sami.kerola@tomtom.com>

cfdisk: fix gcc warning (unused variable)

cfdisk.c: In function ‘fp_printf’:
cfdisk.c:1760:12: warning: variable ‘x’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Karel Zak <kzak@redhat.com>

fstrim: cast from __u64 to standard C types

Signed-off-by: Karel Zak <kzak@redhat.com>

hwclock: remove unused variables

hwclock.c: In function ‘set_hardware_clock’:
hwclock.c:467:7: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
hwclock.c: In function ‘main’:
hwclock.c:1461:7: warning: variable ‘ARCconsole’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Karel Zak <kzak@redhat.com>

cytune: remove unused variable

cytune.c: In function ‘summary’:
cytune.c:105:9: warning: variable ‘j’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Karel Zak <kzak@redhat.com>

namei: remove unused variable

namei.c: In function ‘print_namei’:
namei.c:368:16: warning: variable ‘prev’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Karel Zak <kzak@redhat.com>

blkid: don't free() uninitialized variable

blkid.c: In function ‘main’:
blkid.c:656:6: warning: ‘res’ may be used uninitialized in this function [-Wuninitialized]
blkid.c:623:9: note: ‘res’ was declared here

Signed-off-by: Karel Zak <kzak@redhat.com>

login: cleanup unused variables

login.c: In function ‘main’:
login.c:389:40: warning: variable ‘errsv’ set but not used [-Wunused-but-set-variable]
login.c:389:9: warning: variable ‘ask’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: fix uninitialized variable in sample

Signed-off-by: Karel Zak <kzak@redhat.com>

colrm: manual update

Inform about long, help & version and options.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

colrm: gotos, long options and argument checking

Unnecessary goto jumps where replaced by a simple function, and
two loops. Long options support help and version, and the two
arguments this command has are now validated with strtoul_or_err.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

col: check with strtol_or_err option argument

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

lib: [linux_version.c] accommodate two-component linux version (e.g. 3.0)

Signed-off-by: Karel Zak <kzak@redhat.com>

mount: canonicalize fstab mnt_dir

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=709681
Signed-off-by: Karel Zak <kzak@redhat.com>

partx: remove unused headers

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

fsck.minix: use common functionalitly

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

mkfs.minix: use common functionality

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

minix: add common functionality

Unite common features and code present in mkfs.minix and fsck.minix into a
single minix.h header. This eases the reading and modification of both
programs.

Futhermore:
    - Replace version2 variable with fs_version (handy when v3 support
      comes along)
    - For superblock attributes and inode information, use small inline
      functions instead of ugly macros.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

libmount: use mnt_table_get_fs_root() in utab code

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: colcrt manual update

Inform about long, help & version and options.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

colctr: use long options and clean coding style

This commit introduces help & version options.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

tests: add colrm basic test

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

lib: add strtoul_or_err() function

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

col: coding style changes

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

docs: col manual update

Long options, with help & version, added. The commint also has
previously undocumented switch `-h convert spaces to tabs' as a
part of col.1 man page.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

col: use long options

This commit introduces help & version options.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

pg: return value warning fix

void function 'makeprint' should not return void expression

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

rev: mark signo unused in sig_handler

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

pg: use size_t for wcstombs() return code

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

mount: use libmount to detect already mounted bind mounts

It's pretty tricky to detect that a bind mount from fstab is already
mounted on system without /etc/mtab. Let's use functionality from
libmount.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=701176
Signed-off-by: Karel Zak <kzak@redhat.com>

libmount: add mnt_table_is_mounted()

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: use sysfs_init() more carefully

Reported-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: add some debug messages

Signed-off-by: Karel Zak <kzak@redhat.com>

lib: [loopdev.c] add module for work loop devices

Signed-off-by: Karel Zak <kzak@redhat.com>

lib: [sysfs.c] fix double free

Signed-off-by: Karel Zak <kzak@redhat.com>

This adds a second parameter to size_to_human_string() to return a
string with a different format based on the following flags:

        SIZE_SUFFIX_1LETTER  = "1K"
        SIZE_SUFFIX_3LETTER  = "1KiB",
        SIZE_SUFFIX_SPACE    = "1 KiB" or "1 K"

[kzak@redhat.com: - rename flags to SIZE_SUFFIX_* format,
                  - fix suffix[] buffer size
                  - add 3 letter version to the test]

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: use AUTOMAKE_OPTIONS = gnu

The change will cause make dist to have INSTALL file from
automake release, which hopefully is more up to date than
manually maintained version.

The gnu option will also require ChangeLog to be present, and
without doubts no-one wants to maintain that manually. I added
file to reference link to internet git repository view.

At the time of make dist current tag is added to the ChangeLog
reference which will make release to point exactly to the point
where changes ended. Minor drawback is that untagged make dist
releases will contain a broken link in ChangeLog.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

build-sys: stop building line(1) by default

Align build system behaviour with DEPRECATED file.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

build-sys: add required files to dist

Files mkfs.h procutils.h sysfs.h where missing from dist file.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

tests: test column(1) with multiple input files

Signed-off-by: Karel Zak <kzak@redhat.com>

column: fix problems with uninitialized variables

Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'column' of git://github.com/kerolasa/lelux-utiliteetit into column

* 'column' of git://github.com/kerolasa/lelux-utiliteetit:
  tests: add column tests
  column.c: global variables removed
  column.c: validate numeric user inputs
  column.c: free memory before exit
  column.c: make table function clarification
  column.c: coding style fixes
  column.c: add version printing
  column.c: replace emalloc with xcalloc

build-sys: cleanup lib/ tests

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: improve blkid__scan_dir

docs: TODO update

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: add ID_PART_ENTRY_{OFFSET,SIZE,DISK}

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: use partno for partitions mapped by DM

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid: found whole-disk for partitions mapped by kpartx

Signed-off-by: Karel Zak <kzak@redhat.com>

tests: add column tests

Very basic regression tests for the column(1) command.

http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/4066

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

column.c: global variables removed

Variables from global scope are moved to main, and passed as
function arguments where ever they are needed.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

column.c: validate numeric user inputs

Use strtol_or_err from strutils.h to check numeric user input is
sane.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

column.c: free memory before exit

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

column.c: make table function clarification

Readability enchancement, and few variable type changes to be
more proper.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>