Merge commit 'origin/master'

fdisk: calculate +size{K,M,G} in 2^N

fdisk(8) does not calculate partition size (+sizeM or +sizeG)
in MiB or GiB correctly. It uses 10^N instead 2^N.

This patch cleanups +sizeX to:

  +sizeK    -- KiB  (2^10)
  +sizeKB   -- KB   (10^3)
  +sizeM    -- MiB  (2^20)
  +sizeMB   -- MB   (10^6)
  +sizeG    -- GB   (10^9)
  +sizeGB   -- GiB  (2^30)

This patch also fixes the "Last cylinder..." hint message. The "+number"
without any suffix is not a size at all. It's number of cylinders/sectors.
Note, the 10^N suffixes are not proposed to end-uses in the hint message.

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

mount: add more details to the --version output

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

sys-utils: correct setarch.8 manpage link creation

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

Addresses-Debian-Bug: #453245
Signed-off-by: Frédéric Bothamy <frederic.bothamy@free.fr>
Signed-off-by: LaMont Jones <lamont@debian.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'stable/v2.13'

changelog: release

hwclockfirst.sh: yet more tweaks for LSB init

Addresses-Debian-Bug: 459760
Signed-off-by: LaMont Jones <lamont@debian.org>

build-sys: add AC_CANONICAL_HOST

This seems to be needed in certain environments.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

docs: mark vipw(1) is deprecated in favor of vipw from shadow-utils

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

Merge branch 'stable/v2.13'

Conflicts:

AUTHORS
NEWS
configure.ac
debian/changelog
docs/v2.13.1-ReleaseNotes
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

Kept master version of non-debian/
merged debian/changelog, dropped 2.14~a0 version

Merge commit 'origin/master'

Conflicts:

mount/mount.8

changelog: release

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

renice: correctly detect errors in arguments

renice was using atoi(), which does no error detection, meaning that:
"renice +20 blah" was accepted as valid.

Addresses-Debian-Bug: 385245
Signed-off-by: LaMont Jones <lamont@debian.org>

renice: correctly detect errors in arguments

renice was using atoi(), which does no error detection, meaning that:
"renice +20 blah" was accepted as valid.

Addresses-Debian-Bug: 385245
Signed-off-by: LaMont Jones <lamont@debian.org>

hwclock.sh: add full path to comment

Addresses-Debian-Bug: 418107
Signed-off-by: LaMont Jones <lamont@debian.org>

meta: mount should pre-depend on its libs

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

changelog: release

hwclockfirst: more LSB init cleanup

Addresses-Debian-Bug: 458346
Signed-off-by: LaMont Jones <lamont@debian.org>

build-sys: disable syscall fallbacks for non-linux systems

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

swapon: add sundries.h

so we can compile with -fno-common.

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

mount: "nofail" mount option

It would be nice to have a mount option "nofail" indicating that mount
should not return an error if the device does not exit. This is useful
for hotpluggable devices which are configured in fstab and __might__
not exist at boot time.

Co-Author: Karel Zak <kzak@redhat.com>
Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

cfdisk: define portable {DEFAULT,ALTERNATE}_DEVICE

Set DEFAULT_DEVICE and ALTERNATE_DEVICE for GNU/Hurd and FreeBSD

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

setterm: remove unnecessaty ifndef TCGETS

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

more: replace CBAUD with cfgetispeed()

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

login: replace termio with termios interface

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

agetty: replace termio with termios interface

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

build-sys: release++ (-rc2)

Increment release number to v2.13.1-rc2

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

po: update po files

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

docs: update ReleaseNotes

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

docs: update AUTHORS file, add all translators

This patch also merges TRANSLATORS and CONTRIBUTORS to the one list
only.  It's more simple to maintain this one list.

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

po: add pl.po (from translationproject.org)

po: add eu.po (from translationproject.org)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

rules: correct LSB init data for hwclockfirst.sh

Addresses-Debian-Bug: 458346
Signed-off-by: LaMont Jones <lamont@debian.org>

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>