diff -Nru util-linux-2.28.1/AUTHORS util-linux-2.28.2/AUTHORS --- util-linux-2.28.1/AUTHORS 2016-08-11 09:22:38.131395646 +0000 +++ util-linux-2.28.2/AUTHORS 2016-09-07 11:31:46.467112403 +0000 @@ -215,6 +215,7 @@ Florian Zumbiehl Forest Bond Francesco Cosoleto + Franco Fichtner François Revol Fran Diéguez Frank Mayhar @@ -247,6 +248,7 @@ Harald Hoyer Hayden James Heiko Carstens + Helge Deller Helmut Grohne Hendrik Lönngren Henne Vogelsang @@ -464,6 +466,7 @@ Ronny Chevalier Ron Sommeling Ross Biro + Rostislav Skudnov Roy Peled Ruediger Meier Sami Kerola diff -Nru util-linux-2.28.1/ChangeLog util-linux-2.28.2/ChangeLog --- util-linux-2.28.1/ChangeLog 2016-08-11 09:30:26.236209695 +0000 +++ util-linux-2.28.2/ChangeLog 2016-09-07 11:40:59.419488755 +0000 @@ -1,3 +1,3 @@ See version control history. -http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.28.1 +http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.28.2 diff -Nru util-linux-2.28.1/configure util-linux-2.28.2/configure --- util-linux-2.28.1/configure 2016-08-11 09:29:39.053534157 +0000 +++ util-linux-2.28.2/configure 2016-09-07 11:36:20.036305071 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for util-linux 2.28.1. +# Generated by GNU Autoconf 2.69 for util-linux 2.28.2. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='util-linux' PACKAGE_TARNAME='util-linux' -PACKAGE_VERSION='2.28.1' -PACKAGE_STRING='util-linux 2.28.1' +PACKAGE_VERSION='2.28.2' +PACKAGE_STRING='util-linux 2.28.2' PACKAGE_BUGREPORT='kzak@redhat.com' PACKAGE_URL='http://www.kernel.org/pub/linux/utils/util-linux/' @@ -1876,7 +1876,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures util-linux 2.28.1 to adapt to many kinds of systems. +\`configure' configures util-linux 2.28.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1946,7 +1946,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-linux 2.28.1:";; + short | recursive ) echo "Configuration of util-linux 2.28.2:";; esac cat <<\_ACEOF @@ -2243,7 +2243,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-linux configure 2.28.1 +util-linux configure 2.28.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2769,7 +2769,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-linux $as_me 2.28.1, which was +It was created by util-linux $as_me 2.28.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5008,7 +5008,7 @@ # Define the identity of the package. PACKAGE='util-linux' - VERSION='2.28.1' + VERSION='2.28.2' cat >>confdefs.h <<_ACEOF @@ -5367,7 +5367,7 @@ LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE" -LIBBLKID_DATE="11-Aug-2016" +LIBBLKID_DATE="07-Sep-2016" LIBBLKID_LT_MAJOR=1 LIBBLKID_LT_MINOR=1 LIBBLKID_LT_MICRO=0 @@ -15604,7 +15604,7 @@ cpu_HPPA=false case "$host" in - hppa*) cpu_HPPA=true ;; + hppa*|parisc*) cpu_HPPA=true ;; esac if test "x$cpu_HPPA" = xtrue; then ARCH_HPPA_TRUE= @@ -30475,7 +30475,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-linux $as_me 2.28.1, which was +This file was extended by util-linux $as_me 2.28.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30542,7 +30542,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -util-linux config.status 2.28.1 +util-linux config.status 2.28.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru util-linux-2.28.1/configure.ac util-linux-2.28.2/configure.ac --- util-linux-2.28.1/configure.ac 2016-08-11 09:28:39.631942783 +0000 +++ util-linux-2.28.2/configure.ac 2016-09-07 11:35:17.858713641 +0000 @@ -30,7 +30,7 @@ dnl libblkid version LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE" -LIBBLKID_DATE="11-Aug-2016" +LIBBLKID_DATE="07-Sep-2016" LIBBLKID_LT_MAJOR=1 LIBBLKID_LT_MINOR=1 LIBBLKID_LT_MICRO=0 @@ -182,7 +182,7 @@ UL_SET_ARCH([PPC], [ppc*|powerpc*]) UL_SET_ARCH([M68K], [m68*]) UL_SET_ARCH([MIPS], [mips*]) -UL_SET_ARCH([HPPA], [hppa*]) +UL_SET_ARCH([HPPA], [hppa*|parisc*]) AC_SYS_LARGEFILE AC_HEADER_ASSERT diff -Nru util-linux-2.28.1/debian/changelog util-linux-2.28.2/debian/changelog --- util-linux-2.28.1/debian/changelog 2016-08-24 05:19:36.000000000 +0000 +++ util-linux-2.28.2/debian/changelog 2016-09-12 21:22:44.000000000 +0000 @@ -1,3 +1,39 @@ +util-linux (2.28.2-1ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Regularly trim SSDs automatically (core-1311-ssd-trimming): + + Add debian/fstrim-all.cron: Call fstrim --all. Installed as + /etc/cron.weekly/fstrim. + - Drop debian/hwclock.rules and hwclock.default, recent kernels sync the + RTC automatically. + - Add sulogin-fallback-static-sh.patch: Add support for /bin/static-sh as + fallback if the regular shell fails to execute. Patch ported from + sysvinit. (see LP #505887) + - Add sulogin-lockedpwd.patch: Make sure file systems can be fixed on + machines with locked root accounts (as Ubuntu does by default). Don't + require --force for sulogin. + - Drop debian/util-linux.preinst: Unconditionally deleting files + is wrong, and dpkg will overwrite symlinks with real files anyway. + - Drop the Breaks: cloud-utils, Ubuntu has a different cloud-utils + packaging and this does not affect Ubuntu > 16.04 any more. + - Add debian/util-linux.maintscript to clean upstart jobs on upgrade. This + needs to be kept until after 18.04 LTS. + * The new upstream version reverts the sfdisk exit code change from 2.28.1. + (LP: #1619285) + + -- Martin Pitt Mon, 12 Sep 2016 23:22:44 +0200 + +util-linux (2.28.2-1) unstable; urgency=medium + + * debian/gbp.conf: set upstream-vcs-tag for import-orig + * New upstream release. + - among other things includes fixes for HPPA testsuite failures + (Closes: #827225) + * Drop d/p/tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch + - now include in upstream release. + + -- Andreas Henriksson Fri, 09 Sep 2016 14:20:42 +0200 + util-linux (2.28.1-1ubuntu1) yakkety; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru util-linux-2.28.1/debian/gbp.conf util-linux-2.28.2/debian/gbp.conf --- util-linux-2.28.1/debian/gbp.conf 2016-08-15 15:29:14.000000000 +0000 +++ util-linux-2.28.2/debian/gbp.conf 2016-09-09 12:20:42.000000000 +0000 @@ -11,3 +11,6 @@ [pq] patch-numbers = False + +[import-orig] +upstream-vcs-tag = v%(version)s diff -Nru util-linux-2.28.1/debian/patches/series util-linux-2.28.2/debian/patches/series --- util-linux-2.28.1/debian/patches/series 2016-08-24 05:18:16.000000000 +0000 +++ util-linux-2.28.2/debian/patches/series 2016-09-12 21:22:12.000000000 +0000 @@ -2,6 +2,5 @@ man-page-tweaks-cleanup-my_dev_t.h-ancient-stuff.patch Disable-the-fallback-clause-in-hwclock-when-dev-rtc-.patch verbose-tests.patch -tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch sulogin-fallback-static-sh.patch sulogin-lockedpwd.patch diff -Nru util-linux-2.28.1/debian/patches/tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch util-linux-2.28.2/debian/patches/tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch --- util-linux-2.28.1/debian/patches/tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch 2016-08-15 15:29:14.000000000 +0000 +++ util-linux-2.28.2/debian/patches/tests-Fix-fdisk-id-and-fdisk-mbr-nondos-mode-on-Sparc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -From: James Clarke -Date: Thu, 14 Jul 2016 09:02:24 +0100 -Subject: tests: Fix fdisk/id and fdisk/mbr-nondos-mode on Sparc - -On Sparc, fdisk defaults to using SUN disk labels, which causes the -output from these tests to differ from non-Sparc. - -Signed-off-by: James Clarke ---- - tests/expected/fdisk/id.sparc | 3 + - tests/expected/fdisk/mbr-nondos-mode.sparc | 189 +++++++++++++++++++++++++++++ - tests/ts/fdisk/id | 13 ++ - tests/ts/fdisk/mbr-nondos-mode | 13 ++ - 4 files changed, 218 insertions(+) - create mode 100644 tests/expected/fdisk/id.sparc - create mode 100644 tests/expected/fdisk/mbr-nondos-mode.sparc - -diff --git a/tests/expected/fdisk/id.sparc b/tests/expected/fdisk/id.sparc -new file mode 100644 -index 0000000..aa3f407 ---- /dev/null -+++ b/tests/expected/fdisk/id.sparc -@@ -0,0 +1,3 @@ -+Initialize empty image -+Create MBR with ID=0x1 -+Create MBR with ID=0x2 -diff --git a/tests/expected/fdisk/mbr-nondos-mode.sparc b/tests/expected/fdisk/mbr-nondos-mode.sparc -new file mode 100644 -index 0000000..ffbbd80 ---- /dev/null -+++ b/tests/expected/fdisk/mbr-nondos-mode.sparc -@@ -0,0 +1,189 @@ -+Initialize empty image -+8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img -+Create new DOS partition table -+8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+------------------- -+ -+Create 1st primary partition -+d5ad6d4e743430c2a61e558bb3319175 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Set primary partition active -+d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Re-create 1st primary partition -+d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+------------------- -+ -+Create 2nd primary partition -+d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+------------------- -+ -+Create extended partition -+d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Create logical partitions -+d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Delete logical partitions -+d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Create another logical partition -+d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+1 0 16064 16065 7.9M 83 Linux native r -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Delete primary partition -+0bd87175c4c5c3ef9a46595027b6369c mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+2 16065 32129 16065 7.9M 82 Linux swap u -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Delete primary partition -+33f6e541ddcafed65d231ce3f2b76a59 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+ -+Device Start End Sectors Size Id Type Flags -+3 0 32129 32130 15.7M 5 Whole disk -+------------------- -+ -+Delete extended partition -+e923755cbc0054eb85341fe119be07f9 mbr-nondos-mode.img -+ -+---layout---------- -+Disk : 20 MiB, 20971520 bytes, 40960 sectors -+Geometry: 255 heads, 63 sectors/track, 2 cylinders -+Units: sectors of 1 * 512 = 512 bytes -+Sector size (logical/physical): 512 bytes / 512 bytes -+I/O size (minimum/optimal): 512 bytes / bytes -+Disklabel type: sun -+------------------- -+ -diff --git a/tests/ts/fdisk/id b/tests/ts/fdisk/id -index a24d793..85b87d6 100755 ---- a/tests/ts/fdisk/id -+++ b/tests/ts/fdisk/id -@@ -25,6 +25,19 @@ ts_check_test_command "$TS_CMD_FDISK" - FDISK_CMD_ID1="x\ni\n0x1\nr\nw\n" - FDISK_CMD_ID2="x\ni\n0x2\nr\nw\n" - -+# Sparc uses SUN disk labels by default and thus has a different output -+ARCH=$(uname -m) -+case $ARCH in -+ *sparc* ) -+ ARCH_EXT=".sparc" -+ ;; -+ *) -+ ARCH_EXT="" -+ ;; -+esac -+ -+TS_EXPECTED+="${ARCH_EXT}" -+ - ts_log "Initialize empty image" - TEST_IMAGE_NAME=$(ts_image_init 10) - -diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode -index f39b5e0..ecd19d8 100755 ---- a/tests/ts/fdisk/mbr-nondos-mode -+++ b/tests/ts/fdisk/mbr-nondos-mode -@@ -36,6 +36,19 @@ FDISK_CMD_DELETE_1PRIMARY="d\n1\n" # delete first primary - FDISK_CMD_DELETE_2PRIMARY="d\n2\n" # delete first primary - FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary - -+# Sparc uses SUN disk labels by default and thus has a different output -+ARCH=$(uname -m) -+case $ARCH in -+ *sparc* ) -+ ARCH_EXT=".sparc" -+ ;; -+ *) -+ ARCH_EXT="" -+ ;; -+esac -+ -+TS_EXPECTED+="${ARCH_EXT}" -+ - function print_layout { - echo -ne "\n---layout----------\n" >> $TS_OUTPUT - $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT diff -Nru util-linux-2.28.1/disk-utils/sfdisk.c util-linux-2.28.2/disk-utils/sfdisk.c --- util-linux-2.28.1/disk-utils/sfdisk.c 2016-08-11 08:58:34.448868246 +0000 +++ util-linux-2.28.2/disk-utils/sfdisk.c 2016-09-07 10:35:50.700116892 +0000 @@ -534,7 +534,7 @@ rc = move_partition_data(sf, sf->partno, sf->orig_pa); if (!rc) { fdisk_info(sf->cxt, _("\nThe partition table has been altered.")); - rc = fdisk_reread_partition_table(sf->cxt); + fdisk_reread_partition_table(sf->cxt); } } if (!rc) diff -Nru util-linux-2.28.1/Documentation/releases/v2.28.2-ReleaseNotes util-linux-2.28.2/Documentation/releases/v2.28.2-ReleaseNotes --- util-linux-2.28.1/Documentation/releases/v2.28.2-ReleaseNotes 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.28.2/Documentation/releases/v2.28.2-ReleaseNotes 2016-09-07 11:33:57.346244505 +0000 @@ -0,0 +1,32 @@ +util-linux 2.28.2 Release Notes +=============================== + +blkdev: + - guard against missing DIOCGDINFO on FreeBSD 11 [Franco Fichtner] +build-sys: + - add parisc to define ARCH_ [Karel Zak] +docs: + - update AUTHORS file [Karel Zak] +lib/loopdev: + - Set errno in is_loopdev on error [Tobias Stoeckmann] +libblkid: + - Avoid OOB access on illegal ZFS superblocks [Tobias Stoeckmann] + - Check that cluster size is nonzero when probing exFAT [Rostislav Skudnov] + - [exfat] Limit maximum number of iterations in find_label [Rostislav Skudnov] +libsmartcols: + - fix empty cell padding [Karel Zak] + - fix padding for non-maxout output [Karel Zak] +lsns: + - missing ns/ is not error [Karel Zak] +pathnames: + - guard clashing definitions on FreeBSD [Franco Fichtner] +po: + - merge changes [Karel Zak] +sfdisk: + - revert exit with error if rereading partition table fails [Karel Zak] +tests: + - Fix fdisk/id and fdisk/mbr-nondos-mode on Sparc [James Clarke] + - keep 'hppa' in fdisk/bsd test too [Karel Zak] + - really fix fdisk/bsd for hppa [Helge Deller] +umount: + - fix obsolete info about loop= in umount.8 [Karel Zak] diff -Nru util-linux-2.28.1/include/pathnames.h util-linux-2.28.2/include/pathnames.h --- util-linux-2.28.1/include/pathnames.h 2016-07-20 09:05:27.469677081 +0000 +++ util-linux-2.28.2/include/pathnames.h 2016-08-31 09:09:48.726821335 +0000 @@ -46,10 +46,14 @@ #define _PATH_MAILDIR "/var/spool/mail" #endif #define _PATH_MOTDFILE "/etc/motd" +#ifndef _PATH_NOLOGIN #define _PATH_NOLOGIN "/etc/nologin" +#endif #define _PATH_VAR_NOLOGIN "/var/run/nologin" +#ifndef _PATH_LOGIN #define _PATH_LOGIN "/bin/login" +#endif #define _PATH_SHUTDOWN "/sbin/shutdown" #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" diff -Nru util-linux-2.28.1/lib/blkdev.c util-linux-2.28.2/lib/blkdev.c --- util-linux-2.28.1/lib/blkdev.c 2016-08-11 08:58:34.449868239 +0000 +++ util-linux-2.28.2/lib/blkdev.c 2016-09-07 10:35:50.701116885 +0000 @@ -133,7 +133,7 @@ } #endif /* FDGETPRM */ -#ifdef HAVE_SYS_DISKLABEL_H +#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) { /* * This code works for FreeBSD 4.11 i386, except for the full device @@ -161,7 +161,7 @@ } } } -#endif /* HAVE_SYS_DISKLABEL_H */ +#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */ { struct stat st; diff -Nru util-linux-2.28.1/lib/loopdev.c util-linux-2.28.2/lib/loopdev.c --- util-linux-2.28.1/lib/loopdev.c 2016-08-11 08:58:34.449868239 +0000 +++ util-linux-2.28.2/lib/loopdev.c 2016-09-07 10:35:50.701116885 +0000 @@ -634,12 +634,13 @@ { struct stat st; - if (!device) - return 0; - - return (stat(device, &st) == 0 && + if (device && stat(device, &st) == 0 && S_ISBLK(st.st_mode) && - major(st.st_rdev) == LOOPDEV_MAJOR); + major(st.st_rdev) == LOOPDEV_MAJOR) + return 1; + + errno = ENODEV; + return 0; } /* diff -Nru util-linux-2.28.1/libblkid/docs/version.xml util-linux-2.28.2/libblkid/docs/version.xml --- util-linux-2.28.1/libblkid/docs/version.xml 2016-08-11 09:29:45.872487264 +0000 +++ util-linux-2.28.2/libblkid/docs/version.xml 2016-09-07 11:36:26.822260480 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2 diff -Nru util-linux-2.28.1/libblkid/src/blkid.h util-linux-2.28.2/libblkid/src/blkid.h --- util-linux-2.28.1/libblkid/src/blkid.h 2016-08-11 09:29:45.880487210 +0000 +++ util-linux-2.28.2/libblkid/src/blkid.h 2016-09-07 11:36:26.830260427 +0000 @@ -30,8 +30,8 @@ extern "C" { #endif -#define BLKID_VERSION "2.28.1" -#define BLKID_DATE "11-Aug-2016" +#define BLKID_VERSION "2.28.2" +#define BLKID_DATE "07-Sep-2016" /** * blkid_dev: diff -Nru util-linux-2.28.1/libblkid/src/superblocks/exfat.c util-linux-2.28.2/libblkid/src/superblocks/exfat.c --- util-linux-2.28.1/libblkid/src/superblocks/exfat.c 2016-07-20 09:05:27.480677009 +0000 +++ util-linux-2.28.2/libblkid/src/superblocks/exfat.c 2016-08-31 09:07:55.609602844 +0000 @@ -86,8 +86,10 @@ uint32_t cluster = le32_to_cpu(sb->rootdir_cluster); uint64_t offset = cluster_to_offset(sb, cluster); uint8_t *entry; + const size_t max_iter = 10000; + size_t i = 0; - for (;;) { + for (; i < max_iter; i++) { entry = (uint8_t *) blkid_probe_get_buffer(pr, offset, EXFAT_ENTRY_SIZE); if (!entry) @@ -96,6 +98,7 @@ return NULL; if (entry[0] == EXFAT_ENTRY_LABEL) return (struct exfat_entry_label *) entry; + offset += EXFAT_ENTRY_SIZE; if (offset % CLUSTER_SIZE(sb) == 0) { cluster = next_cluster(pr, sb, cluster); @@ -106,6 +109,8 @@ offset = cluster_to_offset(sb, cluster); } } + + return NULL; } static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag) @@ -114,7 +119,7 @@ struct exfat_entry_label *label; sb = blkid_probe_get_sb(pr, mag, struct exfat_super_block); - if (!sb) + if (!sb || !CLUSTER_SIZE(sb)) return errno ? -errno : BLKID_PROBE_NONE; label = find_label(pr, sb); diff -Nru util-linux-2.28.1/libblkid/src/superblocks/zfs.c util-linux-2.28.2/libblkid/src/superblocks/zfs.c --- util-linux-2.28.1/libblkid/src/superblocks/zfs.c 2016-08-11 08:58:34.452868215 +0000 +++ util-linux-2.28.2/libblkid/src/superblocks/zfs.c 2016-09-07 10:35:50.704116866 +0000 @@ -115,7 +115,7 @@ nvs->nvs_type = be32_to_cpu(nvs->nvs_type); nvs->nvs_strlen = be32_to_cpu(nvs->nvs_strlen); - if (nvs->nvs_strlen > UINT_MAX - sizeof(*nvs)) + if (nvs->nvs_strlen > INT_MAX - sizeof(*nvs)) break; avail -= nvs->nvs_strlen + sizeof(*nvs); nvdebug("nvstring: type %u string %*s\n", nvs->nvs_type, diff -Nru util-linux-2.28.1/libfdisk/docs/version.xml util-linux-2.28.2/libfdisk/docs/version.xml --- util-linux-2.28.1/libfdisk/docs/version.xml 2016-08-11 09:29:45.894487113 +0000 +++ util-linux-2.28.2/libfdisk/docs/version.xml 2016-09-07 11:36:26.845260329 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2 diff -Nru util-linux-2.28.1/libfdisk/src/libfdisk.h util-linux-2.28.2/libfdisk/src/libfdisk.h --- util-linux-2.28.1/libfdisk/src/libfdisk.h 2016-08-11 09:29:45.902487059 +0000 +++ util-linux-2.28.2/libfdisk/src/libfdisk.h 2016-09-07 11:36:26.853260277 +0000 @@ -34,11 +34,11 @@ * * Library version string */ -#define LIBFDISK_VERSION "2.28.1" +#define LIBFDISK_VERSION "2.28.2" #define LIBFDISK_MAJOR_VERSION 2 #define LIBFDISK_MINOR_VERSION 28 -#define LIBFDISK_PATCH_VERSION 1 +#define LIBFDISK_PATCH_VERSION 2 /** * fdisk_context: diff -Nru util-linux-2.28.1/libmount/docs/version.xml util-linux-2.28.2/libmount/docs/version.xml --- util-linux-2.28.1/libmount/docs/version.xml 2016-08-11 09:29:45.916486962 +0000 +++ util-linux-2.28.2/libmount/docs/version.xml 2016-09-07 11:36:26.867260184 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2 diff -Nru util-linux-2.28.1/libmount/src/libmount.h util-linux-2.28.2/libmount/src/libmount.h --- util-linux-2.28.1/libmount/src/libmount.h 2016-08-11 09:29:45.924486907 +0000 +++ util-linux-2.28.2/libmount/src/libmount.h 2016-09-07 11:36:26.875260132 +0000 @@ -29,10 +29,10 @@ #include #include -#define LIBMOUNT_VERSION "2.28.1" +#define LIBMOUNT_VERSION "2.28.2" #define LIBMOUNT_MAJOR_VERSION 2 #define LIBMOUNT_MINOR_VERSION 28 -#define LIBMOUNT_PATCH_VERSION 1 +#define LIBMOUNT_PATCH_VERSION 2 /** * libmnt_cache: diff -Nru util-linux-2.28.1/libsmartcols/docs/version.xml util-linux-2.28.2/libsmartcols/docs/version.xml --- util-linux-2.28.1/libsmartcols/docs/version.xml 2016-08-11 09:29:45.938486811 +0000 +++ util-linux-2.28.2/libsmartcols/docs/version.xml 2016-09-07 11:36:26.889260040 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2 diff -Nru util-linux-2.28.1/libsmartcols/src/libsmartcols.h util-linux-2.28.2/libsmartcols/src/libsmartcols.h --- util-linux-2.28.1/libsmartcols/src/libsmartcols.h 2016-08-11 09:29:45.946486755 +0000 +++ util-linux-2.28.2/libsmartcols/src/libsmartcols.h 2016-09-07 11:36:26.896259993 +0000 @@ -23,7 +23,7 @@ * * Library version string */ -#define LIBSMARTCOLS_VERSION "2.28.1" +#define LIBSMARTCOLS_VERSION "2.28.2" /** * libscols_iter: diff -Nru util-linux-2.28.1/libsmartcols/src/table_print.c util-linux-2.28.2/libsmartcols/src/table_print.c --- util-linux-2.28.1/libsmartcols/src/table_print.c 2016-08-11 08:58:34.457868176 +0000 +++ util-linux-2.28.2/libsmartcols/src/table_print.c 2016-09-07 10:35:50.709116833 +0000 @@ -243,9 +243,15 @@ } } } + + if (!is_last_column(cl)) + return; + /* fill rest of cell with space */ - for(; len_pad <= cl->width; ++len_pad) + for(; len_pad < cl->width; ++len_pad) fputc(' ', tb->out); + + fputs(colsep(tb), tb->out); } @@ -374,12 +380,12 @@ fputs(UL_COLOR_RESET, tb->out); free(data); - for (i = len; i < width; i++) - fputc(' ', tb->out); /* padding */ - if (is_last_column(cl)) return 0; + for (i = len; i < width; i++) + fputc(' ', tb->out); /* padding */ + fputs(colsep(tb), tb->out); /* columns separator */ return 0; err: @@ -449,8 +455,7 @@ if (is_last_column(cl) && len < width && !scols_table_is_maxout(tb) - && !scols_column_is_right(cl) - && !scols_column_is_wrap(cl)) + && !scols_column_is_right(cl)) width = len; /* truncate data */ diff -Nru util-linux-2.28.1/NEWS util-linux-2.28.2/NEWS --- util-linux-2.28.1/NEWS 2016-08-11 09:28:14.863113107 +0000 +++ util-linux-2.28.2/NEWS 2016-09-07 11:34:54.738865559 +0000 @@ -1,3 +1,7 @@ +util-linux 2.28.2: Sep 07 2016 +* see Documentation/releases/v2.28.2-ReleaseNotes or the complete changelog at + ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.2-ChangeLog + util-linux 2.28.1: Aug 11 2016 * see Documentation/releases/v2.28.1-ReleaseNotes or the complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ChangeLog Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/ca.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/ca.gmo differ diff -Nru util-linux-2.28.1/po/ca.po util-linux-2.28.2/po/ca.po --- util-linux-2.28.1/po/ca.po 2016-08-11 09:30:21.813240110 +0000 +++ util-linux-2.28.2/po/ca.po 2016-09-07 11:40:54.942515151 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: util-linux 2.13-pre3\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2005-09-17 13:40+0200\n" "Last-Translator: Josep Puigdemont \n" "Language-Team: Catalan \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/cs.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/cs.gmo differ diff -Nru util-linux-2.28.1/po/cs.po util-linux-2.28.2/po/cs.po --- util-linux-2.28.1/po/cs.po 2016-08-11 09:30:21.940239237 +0000 +++ util-linux-2.28.2/po/cs.po 2016-09-07 11:40:55.073514378 +0000 @@ -46,7 +46,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-04-02 14:23+02:00\n" "Last-Translator: Petr Písař \n" "Language-Team: Czech \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/da.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/da.gmo differ diff -Nru util-linux-2.28.1/po/da.po util-linux-2.28.2/po/da.po --- util-linux-2.28.1/po/da.po 2016-08-11 09:30:22.030238618 +0000 +++ util-linux-2.28.2/po/da.po 2016-09-07 11:40:55.166513830 +0000 @@ -74,7 +74,7 @@ msgstr "" "Project-Id-Version: util-linux-2.26-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-03-29 19:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/de.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/de.gmo differ diff -Nru util-linux-2.28.1/po/de.po util-linux-2.28.2/po/de.po --- util-linux-2.28.1/po/de.po 2016-08-11 09:30:22.122237985 +0000 +++ util-linux-2.28.2/po/de.po 2016-09-07 11:40:55.262513265 +0000 @@ -52,7 +52,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-04-01 07:29+0200\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/es.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/es.gmo differ diff -Nru util-linux-2.28.1/po/es.po util-linux-2.28.2/po/es.po --- util-linux-2.28.1/po/es.po 2016-08-11 09:30:22.219237319 +0000 +++ util-linux-2.28.2/po/es.po 2016-09-07 11:40:55.363512669 +0000 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-04-10 10:47+0200\n" "Last-Translator: Antonio Ceballos Roa \n" "Language-Team: Spanish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/et.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/et.gmo differ diff -Nru util-linux-2.28.1/po/et.po util-linux-2.28.2/po/et.po --- util-linux-2.28.1/po/et.po 2016-08-11 09:30:22.336236514 +0000 +++ util-linux-2.28.2/po/et.po 2016-09-07 11:40:55.478511991 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: util-linux 2.11r\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n" "Last-Translator: Meelis Roos \n" "Language-Team: Estonian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/eu.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/eu.gmo differ diff -Nru util-linux-2.28.1/po/eu.po util-linux-2.28.2/po/eu.po --- util-linux-2.28.1/po/eu.po 2016-08-11 09:30:22.440235799 +0000 +++ util-linux-2.28.2/po/eu.po 2016-09-07 11:40:55.586511354 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: util-linux-ng 2.17.1-rc1\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2010-02-16 19:58+0100\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/fi.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/fi.gmo differ diff -Nru util-linux-2.28.1/po/fi.po util-linux-2.28.2/po/fi.po --- util-linux-2.28.1/po/fi.po 2016-08-11 09:30:22.543235091 +0000 +++ util-linux-2.28.2/po/fi.po 2016-09-07 11:40:55.689510746 +0000 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: util-linux 2.26-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-08-02 17:53+0300\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/fr.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/fr.gmo differ diff -Nru util-linux-2.28.1/po/fr.po util-linux-2.28.2/po/fr.po --- util-linux-2.28.1/po/fr.po 2016-08-11 09:30:22.666234245 +0000 +++ util-linux-2.28.2/po/fr.po 2016-09-07 11:40:55.818509986 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: util-linux 2.26-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-05-07 13:41-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/gl.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/gl.gmo differ diff -Nru util-linux-2.28.1/po/gl.po util-linux-2.28.2/po/gl.po --- util-linux-2.28.1/po/gl.po 2016-08-11 09:30:22.745233701 +0000 +++ util-linux-2.28.2/po/gl.po 2016-09-07 11:40:55.895509532 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: util-linux-ng 2.18-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2010-08-23 18:09+0200\n" "Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/hr.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/hr.gmo differ diff -Nru util-linux-2.28.1/po/hr.po util-linux-2.28.2/po/hr.po --- util-linux-2.28.1/po/hr.po 2016-08-11 09:30:22.817233206 +0000 +++ util-linux-2.28.2/po/hr.po 2016-09-07 11:40:55.966509113 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: util-linux 2.23-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2013-04-18 16:36+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/hu.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/hu.gmo differ diff -Nru util-linux-2.28.1/po/hu.po util-linux-2.28.2/po/hu.po --- util-linux-2.28.1/po/hu.po 2016-08-11 09:30:22.921232491 +0000 +++ util-linux-2.28.2/po/hu.po 2016-09-07 11:40:56.074508477 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: util-linux-ng 2.18-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2010-07-02 10:44+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/id.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/id.gmo differ diff -Nru util-linux-2.28.1/po/id.po util-linux-2.28.2/po/id.po --- util-linux-2.28.1/po/id.po 2016-08-11 09:30:23.060231535 +0000 +++ util-linux-2.28.2/po/id.po 2016-09-07 11:40:56.208507687 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: util-linux-ng 2.17.1-rc1\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2010-02-18 04:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/it.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/it.gmo differ diff -Nru util-linux-2.28.1/po/it.po util-linux-2.28.2/po/it.po --- util-linux-2.28.1/po/it.po 2016-08-11 09:30:23.161230840 +0000 +++ util-linux-2.28.2/po/it.po 2016-09-07 11:40:56.315507056 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: util-linux-ng 2.13.1-rc1\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2008-04-18 13:44+0100\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/ja.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/ja.gmo differ diff -Nru util-linux-2.28.1/po/ja.po util-linux-2.28.2/po/ja.po --- util-linux-2.28.1/po/ja.po 2016-08-11 09:30:23.273230070 +0000 +++ util-linux-2.28.2/po/ja.po 2016-09-07 11:40:56.425506408 +0000 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-07-20 21:57+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/nl.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/nl.gmo differ diff -Nru util-linux-2.28.1/po/nl.po util-linux-2.28.2/po/nl.po --- util-linux-2.28.1/po/nl.po 2016-08-11 09:30:23.385229301 +0000 +++ util-linux-2.28.2/po/nl.po 2016-09-07 11:40:56.541505724 +0000 @@ -33,7 +33,7 @@ msgstr "" "Project-Id-Version: util-linux-2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-04-28 10:17+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/pl.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/pl.gmo differ diff -Nru util-linux-2.28.1/po/pl.po util-linux-2.28.2/po/pl.po --- util-linux-2.28.1/po/pl.po 2016-08-11 09:30:23.477228668 +0000 +++ util-linux-2.28.2/po/pl.po 2016-09-07 11:40:56.631505193 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-04-02 09:40+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/pt_BR.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/pt_BR.gmo differ diff -Nru util-linux-2.28.1/po/pt_BR.po util-linux-2.28.2/po/pt_BR.po --- util-linux-2.28.1/po/pt_BR.po 2016-08-11 09:30:23.591227884 +0000 +++ util-linux-2.28.2/po/pt_BR.po 2016-09-07 11:40:56.754504468 +0000 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-03-29 18:25-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/ru.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/ru.gmo differ diff -Nru util-linux-2.28.1/po/ru.po util-linux-2.28.2/po/ru.po --- util-linux-2.28.1/po/ru.po 2016-08-11 09:30:23.681227265 +0000 +++ util-linux-2.28.2/po/ru.po 2016-09-07 11:40:56.847503920 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: util-linux 2.27-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-12-29 22:55+0300\n" "Last-Translator: Evgeniy Yakushev \n" "Language-Team: Russian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/sl.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/sl.gmo differ diff -Nru util-linux-2.28.1/po/sl.po util-linux-2.28.2/po/sl.po --- util-linux-2.28.1/po/sl.po 2016-08-11 09:30:23.876225924 +0000 +++ util-linux-2.28.2/po/sl.po 2016-09-07 11:40:56.978503147 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: util-linux 2.13-pre6\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2006-03-05 12:29+0200\n" "Last-Translator: Simon Mihevc \n" "Language-Team: Slovenian \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/sv.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/sv.gmo differ diff -Nru util-linux-2.28.1/po/sv.po util-linux-2.28.2/po/sv.po --- util-linux-2.28.1/po/sv.po 2016-08-11 09:30:23.990225140 +0000 +++ util-linux-2.28.2/po/sv.po 2016-09-07 11:40:57.084502522 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-06-05 14:13+0200\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/tr.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/tr.gmo differ diff -Nru util-linux-2.28.1/po/tr.po util-linux-2.28.2/po/tr.po --- util-linux-2.28.1/po/tr.po 2016-08-11 09:30:24.094224425 +0000 +++ util-linux-2.28.2/po/tr.po 2016-09-07 11:40:57.204501814 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: util-linux 2.13-pre7\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2006-03-06 15:45+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/uk.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/uk.gmo differ diff -Nru util-linux-2.28.1/po/uk.po util-linux-2.28.2/po/uk.po --- util-linux-2.28.1/po/uk.po 2016-08-11 09:30:24.199223703 +0000 +++ util-linux-2.28.2/po/uk.po 2016-09-07 11:40:57.314501166 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: util-linux 2.28-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2016-03-29 20:57+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff -Nru util-linux-2.28.1/po/util-linux.pot util-linux-2.28.2/po/util-linux.pot --- util-linux-2.28.1/po/util-linux.pot 2016-08-11 09:30:21.694240929 +0000 +++ util-linux-2.28.2/po/util-linux.pot 2016-09-07 11:40:54.822515858 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: util-linux 2.28.1\n" +"Project-Id-Version: util-linux 2.28.2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/vi.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/vi.gmo differ diff -Nru util-linux-2.28.1/po/vi.po util-linux-2.28.2/po/vi.po --- util-linux-2.28.1/po/vi.po 2016-08-11 09:30:24.329222809 +0000 +++ util-linux-2.28.2/po/vi.po 2016-09-07 11:40:57.456500329 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: util-linux-2.26-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-02-15 08:31+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/zh_CN.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/zh_CN.gmo differ diff -Nru util-linux-2.28.1/po/zh_CN.po util-linux-2.28.2/po/zh_CN.po --- util-linux-2.28.1/po/zh_CN.po 2016-08-11 09:30:24.430222114 +0000 +++ util-linux-2.28.2/po/zh_CN.po 2016-09-07 11:40:57.559499721 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: util-linux-2.27-rc2\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2015-10-17 09:39+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" Binary files /tmp/tmpmHUcGr/9z3A50YPni/util-linux-2.28.1/po/zh_TW.gmo and /tmp/tmpmHUcGr/4YRny_napw/util-linux-2.28.2/po/zh_TW.gmo differ diff -Nru util-linux-2.28.1/po/zh_TW.po util-linux-2.28.2/po/zh_TW.po --- util-linux-2.28.1/po/zh_TW.po 2016-08-11 09:30:24.540221358 +0000 +++ util-linux-2.28.2/po/zh_TW.po 2016-09-07 11:40:57.669499073 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: util-linux 2.23.1\n" "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n" -"POT-Creation-Date: 2016-08-11 11:30+0200\n" +"POT-Creation-Date: 2016-09-07 13:40+0200\n" "PO-Revision-Date: 2013-06-07 23:29+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" diff -Nru util-linux-2.28.1/sys-utils/lsns.c util-linux-2.28.2/sys-utils/lsns.c --- util-linux-2.28.1/sys-utils/lsns.c 2016-08-11 08:58:34.461868145 +0000 +++ util-linux-2.28.2/sys-utils/lsns.c 2016-09-07 10:35:50.771116423 +0000 @@ -202,7 +202,7 @@ return &infos[ get_column_id(num) ]; } -static ino_t get_ns_ino(int dir, const char *nsname, ino_t *ino) +static int get_ns_ino(int dir, const char *nsname, ino_t *ino) { struct stat st; char path[16]; @@ -267,7 +267,7 @@ continue; rc = get_ns_ino(dirfd(dir), ns_names[i], &p->ns_ids[i]); - if (rc && rc != -EACCES) + if (rc && rc != -EACCES && rc != -ENOENT) goto done; rc = 0; } diff -Nru util-linux-2.28.1/sys-utils/umount.8 util-linux-2.28.2/sys-utils/umount.8 --- util-linux-2.28.1/sys-utils/umount.8 2016-07-20 09:05:27.566676440 +0000 +++ util-linux-2.28.2/sys-utils/umount.8 2016-09-07 10:35:50.773116409 +0000 @@ -80,7 +80,9 @@ .TP .BR \-d , " \-\-detach\-loop" When the unmounted device was a loop device, also free this loop -device. +device. This option is unnecessary for devices initialized by +.BR mount (8), +in this case "autoclear" functionality is enabled by default. .TP .B \-\-fake Causes everything to be done except for the actual system call or umount helper @@ -156,12 +158,14 @@ .SH "LOOP DEVICE" The .B umount -command will free the loop device associated with a mount when -it finds the option \fBloop=...\fR in -.IR /etc/mtab , -or when the \fB\-d\fR option was given. Any still associated loop devices -can be freed by using \fBlosetup -d\fR; see -.BR losetup (8). +command will automatically detach loop device previously initialized by +.BR mount (8) +command independently of /etc/mtab. + +In this case the device is initialized with "autoclear" flag (see +.BR losetup (8) +output for more details), otherwise it's necessary to use the option \fB \-\-detach\-loop\fR +or call \fBlosetup -d \fR. The autoclear feature is supported since Linux 2.6.25. .SH EXTERNAL HELPERS The syntax of external unmount helpers is: .PP diff -Nru util-linux-2.28.1/.tarball-version util-linux-2.28.2/.tarball-version --- util-linux-2.28.1/.tarball-version 2016-08-11 09:30:26.235209702 +0000 +++ util-linux-2.28.2/.tarball-version 2016-09-07 11:40:59.417488767 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2 diff -Nru util-linux-2.28.1/tests/expected/fdisk/id.sparc util-linux-2.28.2/tests/expected/fdisk/id.sparc --- util-linux-2.28.1/tests/expected/fdisk/id.sparc 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.28.2/tests/expected/fdisk/id.sparc 2016-09-02 12:35:32.121494674 +0000 @@ -0,0 +1,3 @@ +Initialize empty image +Create MBR with ID=0x1 +Create MBR with ID=0x2 diff -Nru util-linux-2.28.1/tests/expected/fdisk/mbr-nondos-mode.sparc util-linux-2.28.2/tests/expected/fdisk/mbr-nondos-mode.sparc --- util-linux-2.28.1/tests/expected/fdisk/mbr-nondos-mode.sparc 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.28.2/tests/expected/fdisk/mbr-nondos-mode.sparc 2016-09-02 12:35:32.122494668 +0000 @@ -0,0 +1,189 @@ +Initialize empty image +8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img +Create new DOS partition table +8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +------------------- + +Create 1st primary partition +d5ad6d4e743430c2a61e558bb3319175 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Set primary partition active +d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Re-create 1st primary partition +d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +------------------- + +Create 2nd primary partition +d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +------------------- + +Create extended partition +d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Create logical partitions +d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Delete logical partitions +d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Create another logical partition +d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +1 0 16064 16065 7.9M 83 Linux native r +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Delete primary partition +0bd87175c4c5c3ef9a46595027b6369c mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +2 16065 32129 16065 7.9M 82 Linux swap u +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Delete primary partition +33f6e541ddcafed65d231ce3f2b76a59 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun + +Device Start End Sectors Size Id Type Flags +3 0 32129 32130 15.7M 5 Whole disk +------------------- + +Delete extended partition +e923755cbc0054eb85341fe119be07f9 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Geometry: 255 heads, 63 sectors/track, 2 cylinders +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: sun +------------------- + diff -Nru util-linux-2.28.1/tests/ts/fdisk/bsd util-linux-2.28.2/tests/ts/fdisk/bsd --- util-linux-2.28.1/tests/ts/fdisk/bsd 2016-07-20 09:05:27.575676380 +0000 +++ util-linux-2.28.2/tests/ts/fdisk/bsd 2016-09-02 11:28:40.994825898 +0000 @@ -48,7 +48,7 @@ ARCH=$(uname -m) case $ARCH in # see include/pt-bsd.h - *alpha* | *ppc* | *ia64* | *hppa* ) + *alpha* | *ppc* | *ia64* | *hppa* | *parisc* ) BSD_LABELSECTOR=0 BSD_LABELOFFSET=64 ;; diff -Nru util-linux-2.28.1/tests/ts/fdisk/id util-linux-2.28.2/tests/ts/fdisk/id --- util-linux-2.28.1/tests/ts/fdisk/id 2016-08-11 08:58:34.466868107 +0000 +++ util-linux-2.28.2/tests/ts/fdisk/id 2016-09-02 12:35:32.122494668 +0000 @@ -25,6 +25,19 @@ FDISK_CMD_ID1="x\ni\n0x1\nr\nw\n" FDISK_CMD_ID2="x\ni\n0x2\nr\nw\n" +# Sparc uses SUN disk labels by default and thus has a different output +ARCH=$(uname -m) +case $ARCH in + *sparc* ) + ARCH_EXT=".sparc" + ;; + *) + ARCH_EXT="" + ;; +esac + +TS_EXPECTED+="${ARCH_EXT}" + ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) diff -Nru util-linux-2.28.1/tests/ts/fdisk/mbr-nondos-mode util-linux-2.28.2/tests/ts/fdisk/mbr-nondos-mode --- util-linux-2.28.1/tests/ts/fdisk/mbr-nondos-mode 2016-08-11 08:58:34.466868107 +0000 +++ util-linux-2.28.2/tests/ts/fdisk/mbr-nondos-mode 2016-09-07 10:35:50.776116389 +0000 @@ -36,6 +36,19 @@ FDISK_CMD_DELETE_2PRIMARY="d\n2\n" # delete first primary FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary +# Sparc uses SUN disk labels by default and thus has a different output +ARCH=$(uname -m) +case $ARCH in + *sparc* ) + ARCH_EXT=".sparc" + ;; + *) + ARCH_EXT="" + ;; +esac + +TS_EXPECTED+="${ARCH_EXT}" + function print_layout { echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT diff -Nru util-linux-2.28.1/.version util-linux-2.28.2/.version --- util-linux-2.28.1/.version 2016-08-11 09:29:46.353483957 +0000 +++ util-linux-2.28.2/.version 2016-09-07 11:36:27.310257274 +0000 @@ -1 +1 @@ -2.28.1 +2.28.2