Merge commit 'origin/master'

Merge branch 'stable/v2.13'

Conflicts:

debian/changelog
mount/mount.c

Merge commit 'origin/master'

tailf: non-linux support

Include <sys/inotify.h> only when inotify_init() was detected

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

include: <stdint.h> provides everything

Do not include <linux/posix_types.h> as <stdint.h> provides everything.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

mount: hint about helper program if device doesn't exist

Addresses-Debian-Bug: #452330
Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: LaMont Jones <lamont@debian.org>

partx: use swab macros from bitops.h

Clean up GPT code:
- remove C++ comments
- tailing white-spaces
- use cpu_to_  swab macros from bitops.h

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

fdisk: use swab macros from bitops.h

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

include: add bitops.h with swab{16,32,64} macros

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

include: add bitops.h with swab{16,32,64} macros

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

fdisk: fix building for AVR32 and CRIS

The following simple patch fixes fdisk compilation for the AVR32 and CRIS architectures.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: build arch(1) during distcheck

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

build-sys: simplify code around RDEV_LINKS and SETARCH_LINKS

Signed-off-by: Stepan Kasal <skasal@redhat.com>

build-sys: use portable $(VAR:=) instead of gmake-specific $(addsuffix)

Signed-off-by: Stepan Kasal <skasal@redhat.com>

build-sys: use dist_man_MANS instead of man_MANS

Signed-off-by: Stepan Kasal <skasal@redhat.com>

shutdown: use _PATH_MOUNTED instead of _PATH_MTAB

Signed-off-by: Stepan Kasal <skasal@redhat.com>

tailf: inotify based reimplementation

This patch:
 - clean up tailf(1) code
 - remove stupid "for() { malloc() }" array allocation in the tailf() function
 - add inotify(7) support

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

mount: hint about helper program if device doesn't exist

Addresses-Debian-Bug: #452330
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge commit 'origin/master'

tests: redirect libblkid cache to BLKID_FILE

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

changelog: release

Merge commit 'origin/master'

Merge commit 'origin/stable/v2.13' into stable/v2.13

Conflicts:

getopt/getopt.1

docs: add note about incorrect tag 2.13.1

The git tag 2.13.1 is typo. I forgot to use -rc1 suffix for this tag.
The real 2.13.1 is going to be released with tag 2.13.1-REAL. Sorry.

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

docs: add note about incorrect tag 2.13.1

The git tag 2.13.1 is typo. I forgot to use -rc1 suffix for this tag.
The real 2.13.1 is going to be released with tag 2.13.1-REAL. Sorry.

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

mount: fix fd leak

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

getopt: fix path to examples in getopt.1

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

blockdev: add --getsz to blockdev.8

This patch also marks --getsize as deprecated option.

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

sfdisk: allow partitioning drives of over 2^31 sectors.

sfdisk would incorrectly complain that there was no room when partitioning
a drive over 2^31 sectors in size.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

hwclock: check for ENODEV

/sbin/hwclock is supposed to fall back to using /dev/rtc0 if /dev/rtc isn't
working (which it isn't, because mkinitrd creates it with the old device
numbers, and we're switching to the new RTC_CLASS driver).

Unfortunately, it'll only cope if the error it gets is ENOENT (i.e. the device
node doesn't exist). It doesn't fall back to the next device in the list if the
error is ENODEV, which is what happens when the device node exists, but there's
no driver.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'stable/v2.13'; commit 'origin/master'

Conflicts:

getopt/getopt.1

hwclock: check for ENODEV

/sbin/hwclock is supposed to fall back to using /dev/rtc0 if /dev/rtc isn't
working (which it isn't, because mkinitrd creates it with the old device
numbers, and we're switching to the new RTC_CLASS driver).

Unfortunately, it'll only cope if the error it gets is ENOENT (i.e. the device
node doesn't exist). It doesn't fall back to the next device in the list if the
error is ENODEV, which is what happens when the device node exists, but there's
no driver.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

sfdisk: allow partitioning drives of over 2^31 sectors.

sfdisk would incorrectly complain that there was no room when partitioning
a drive over 2^31 sectors in size.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

losetup: use standard uintxy_t types (struct loop_info64)

The kernel loop_info64 definition uses __u{8,32,64} types,
but userspace uses unsigned {long long,int,char} types.

This patch turns into exactly defined standard uint{8,32,64}_t types.

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

fdisk: non-linux support (use standard uintxy_t instead __uxy)

 - #include <linux/types.h> is turned into #include <stdint.h>, much more
   portable, and __uxy were turned into uintxy_t.

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

setarch: add missing alpha subarchs

Signed-off-by: Oliver Falk <oliver@linux-kernel.at>
Signed-off-by: Karel Zak <kzak@redhat.com>

swapon: readjust the usage summaries

swapon.8: reorder options, lowercase command names, tweak sentences.
swapon.c: tweak descriptions, adjust spaces for proper alignment.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

rtcwake: misc cleanups

Cleanups for rtcwake:

  - Minor doc updates:  highlight the framebuffer problem,
    give correct history of this code
  - Improve debug output
  - Fix some linelength bugs

Note that this code predated the sysfs "wakealarm" mechanism, and
works around several now-fixed bugs in the kernel RTC framework.

Nowadays it would make sense to make this program use only the sysfs
interface to the RTC, using "since_epoch" instead of RTC_RD_TIME and
"wakealarm" instead of the four other ioctls.  That could simplify
the mess involved in timezone handling.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Karel Zak <kzak@redhat.com>

hwclock.sh: drop redundant file pointer.  Closes: #453333

blockdev: add --getsz to blockdev.8

This patch also marks --getsize as deprecated option.

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

swapon: fix typo in usage()

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

getopt: fix path to examples in getopt.1

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

mount: use MNTTYPE_SWAP (from mntent.h)

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

mount: cleanup usage of _PATH_*

The macros MOUNTED and MNTTAB are deprecated. This patch standardize
and consolidate all path macros and remove mount_paths.h.

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

include: add mount paths to pathnames.h

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

agetty: non-linux support (use pathnames.h)

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

include: cleanup pathnames.h

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

tests: add test for include/pathnames.h

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

tests: move test_bkdev to lib/

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

tests: rename test_sysinfo, remove tailing white-spaces

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

script: cleanup includes

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

sfdisk: remove unnecessary linux/unistd.h

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

build-sys: cleanup usage of linux/major.h

The utils like fdisk or login are usable on non-linux systems.
This patch allows to compile on systems without linux/major.h.

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

sys-utils: correct setarch.8 manpage link creation.  Closes: #453245

At least on Debian, .so commands are relative to the man directory
(e.g., /usr/share/man), not to the subdirectory:
    % man i386
    man: can't open /usr/share/man/setarch.8: No such file or directory
    No manual entry for i386

See also http://bugs.debian.org/453245

Signed-off-by: Frédéric Bothamy <frederic.bothamy@free.fr>
Signed-off-by: LaMont Jones <lamont@debian.org>

Merge commit 'origin/master'

fdisk: non-linux support (MAXPATHLEN)

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

namei: non-linux support (get_current_dir_name() and PATH_MAX)

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

wall: cleanup MAXHOSTNAMELEN

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

agetty: cleanup MAXHOSTNAMELEN

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

cfdisk: display cylinders beyond 1024

There is absolutely no reason why cfdisk should not display
cylinders beyond 1024. The number of cylinders needs to be
truncated only for the CHS field.

Signed-off-by: Peter Breitenlohner <peb@mppmu.mpg.de>

getopt: install example scripts as SCRIPTS, not DATA

The example scripts should be installed with execute permissions,
as for util-linux-2.12r and earlier, i.e., as SCRIPTS and not as DATA

Signed-off-by: Peter Breitenlohner <peb@mppmu.mpg.de>

mount: fix fd leak

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

swapon: cleanup usage output

Merge branch 'stable/v2.13'

Conflicts:

NEWS
configure.ac
debian/changelog
mount/lomount.c
mount/mount.c
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po

agetty: drop useless and unused diff from upstream

Signed-off-by: LaMont Jones <lamont@debian.org>

sys-utils: Drop duplicate install of setarch manpage links.

Signed-off-by: LaMont Jones <lamont@debian.org>

agetty: drop useless and unused diff from upstream

Signed-off-by: LaMont Jones <lamont@debian.org>

sys-utils: Drop duplicate install of setarch manpage links.

Signed-off-by: LaMont Jones <lamont@debian.org>

Merge commit 'origin/stable/v2.13' into stable/v2.13.  Closes: #446175

Merge commit 'origin/master'

build-sys: cleanup disk-utils/Makefile.am (use $utils_common)

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

mkfs.minix: device size cleanup

Use blkdev_get_size() function and some size related cleanup.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

mkfs.minix: add sectorsize check

Minix filesystem until version 2 has a fixed blocksize of 1024 bytes.
If you try to create a filsystem on a device with a physical sectorsize
larger than 1024 bytes, this resulting minix fs cannot be mounted,
because the physical sectorsize must be smaller than the filesystem
blocksize.
This patch adds a check for this and will refuse to create a filesystem
if the sectorsize is bigger than the blocksize.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

mount: don't call canonicalize(SPEC) for cifs, smbfs and nfs

When calling "mount -t smbfs //foo/bar /mnt/foo", mount.smbfs will be
called with /foo/bar if /foo/bar exists locally, and will display its
usage.

The patch also removes duplicate canonicalize() from mounted()
function.

Reported-By: Pascal Terjan <pterjan@linuxfr.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

mount: don't call canonicalize(SPEC) for cifs, smbfs and nfs

When calling "mount -t smbfs //foo/bar /mnt/foo", mount.smbfs will be
called with /foo/bar if /foo/bar exists locally, and will display its
usage.

The patch also removes duplicate canonicalize() from mounted()
function.

Reported-By: Pascal Terjan <pterjan@linuxfr.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

tests: add ts-mount-noncanonical

mount(8) shouldn't canonicalize SPEC path for cifs, smbfs, nfs, ...

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

changelog: release

meta: drop Conflicts: bsdmainutils too

changelog: release

cal comes from bsdmainutils as well.

Drop the Replaces:, too, since we don't replace anything anymore.

mount: drop the part always true from a while condition

Signed-off-by: Pascal Terjan <pterjan@linuxfr.org>

build-sys: remove hardcoded _GNU_SOURCE

We have AC_GNU_SOURCE, so we needn't any extra hardcoded _GNU_SOURCE.

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

changelog: start new release

Merge commit 'origin/stable/v2.13' into stable/v2.13

po: update POTFILES.in

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

build-sys: fix missing deps for swapon

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

build-sys: release++

Increment release number to v2.13.1

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

docs: add v2.13.1 ReleaseNotes

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

docs: update AUTHORS file

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

po: update po files

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

po: update fi.po (from translationproject.org)

po: update hu.po (from translationproject.org)

losetup: fix errno usage

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

docs: fix ChangeLog URL

Signed-off-by: Pascal Terjan <pterjan@linuxfr.org>

po: update hu.po (from translationproject.org)

Merge commit 'origin/master'

Conflicts:

mount/Makefile.am
mount/my_dev_t.h

build-sys: non-linux support

Here is a patch that disables linux-specific tools on non-linux targets.

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

more: non-linux support

Signed-Off-By: Samuel Thibault <samuel.thibault@ens-lyon.org>

mount: use blkdev_get_size()

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

sfdisk: use get_linux_version()

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