]> err.no Git - util-linux/log
util-linux
14 years agoblkid: add \n to the "-o udev" output when probe more devices
Karel Zak [Thu, 15 Apr 2010 11:15:35 +0000 (13:15 +0200)]
blkid: add \n to the "-o udev" output when probe more devices

Old output:
# blkid -p -o udev /dev/sda{1,3}
ID_FS_LABEL=/boot
ID_FS_LABEL_ENC=\x2fboot
ID_FS_UUID=f1cd38fa-c887-4ab8-834b-c8ee659b97fe
ID_FS_UUID_ENC=f1cd38fa-c887-4ab8-834b-c8ee659b97fe
ID_FS_VERSION=1.0
ID_FS_TYPE=ext3
ID_FS_USAGE=filesystem
ID_FS_LABEL=BAR
ID_FS_LABEL_ENC=BAR
ID_FS_UUID=1f2aa318-9c34-462e-8d29-260819ffd657
ID_FS_UUID_ENC=1f2aa318-9c34-462e-8d29-260819ffd657
ID_FS_VERSION=2
ID_FS_TYPE=swap
ID_FS_USAGE=other

new output:
# blkid -p -o udev /dev/sda{1,3}
ID_FS_LABEL=/boot
ID_FS_LABEL_ENC=\x2fboot
ID_FS_UUID=f1cd38fa-c887-4ab8-834b-c8ee659b97fe
ID_FS_UUID_ENC=f1cd38fa-c887-4ab8-834b-c8ee659b97fe
ID_FS_VERSION=1.0
ID_FS_TYPE=ext3
ID_FS_USAGE=filesystem

ID_FS_LABEL=BAR
ID_FS_LABEL_ENC=BAR
ID_FS_UUID=1f2aa318-9c34-462e-8d29-260819ffd657
ID_FS_UUID_ENC=1f2aa318-9c34-462e-8d29-260819ffd657
ID_FS_VERSION=2
ID_FS_TYPE=swap
ID_FS_USAGE=other

Reported-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: fix some typos
Milan Broz [Thu, 8 Apr 2010 19:15:25 +0000 (21:15 +0200)]
libblkid: fix some typos

Signed-off-by: Milan Broz <mbroz@redhat.com>
14 years agomount: use auto-loopdev for all known filesystems
Karel Zak [Thu, 8 Apr 2010 14:38:23 +0000 (16:38 +0200)]
mount: use auto-loopdev for all known filesystems

The commit e580266914734898999f652025f9c7141023df66 introduced
"automatically detect and loop-mount regular files". This should be
used only for filesystems that require block devices.

All known filesystems in libblkid depend block devices, so we can
use blkid_known_fstype() as a filter for this feature.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agortcwake: add --dry-run option
Karel Zak [Thu, 8 Apr 2010 07:20:21 +0000 (09:20 +0200)]
rtcwake: add --dry-run option

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agortcwake: does miss the "off" option
Karel Zak [Thu, 8 Apr 2010 06:51:00 +0000 (08:51 +0200)]
rtcwake: does miss the "off" option

Reported-by: Piergiorgio Sartor <piergiorgio.sartor@nexgo.de>
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=580296
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswaplabel: fix typo in man page
Karel Zak [Wed, 7 Apr 2010 14:37:59 +0000 (16:37 +0200)]
swaplabel: fix typo in man page

Reported-by: Marcos Felipe Rasia de Mello <marcosfrm@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add ultrix PT support
Karel Zak [Wed, 7 Apr 2010 09:31:37 +0000 (11:31 +0200)]
libblkid: add ultrix PT support

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: fix 'partno' usage
Karel Zak [Wed, 7 Apr 2010 07:39:05 +0000 (09:39 +0200)]
libblkid: fix 'partno' usage

Linux kernel ignores empty partitions, but partition number is always
allocated for the partition. (This rule is used for primary partitions
only.)

For example:

  part 1.  size=12345
  part 2.  size=0
  part 3.  size=24567

the final list of partitions:

  sda1 sda3

'sda2' is not defined and partno=2 is not used for any other
partitions.

The libblkid library has to be compatible with this rule.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: fix blkid_partlist_devno_to_partition() for extended partitions
Karel Zak [Tue, 6 Apr 2010 15:57:49 +0000 (17:57 +0200)]
libblkid: fix blkid_partlist_devno_to_partition() for extended partitions

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswaplabel: new command
Jason Borden [Fri, 2 Apr 2010 13:52:45 +0000 (15:52 +0200)]
swaplabel: new command

Print or change the label / UUID of a swap area.

[kzak@redhat.com: - code refactoring
                  - add long options
                  - clean up Makefile.am]

Signed-off-by: Jason Borden <jborden@bluehost.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomkswap: zap bootbits on regular files
Karel Zak [Fri, 2 Apr 2010 10:49:07 +0000 (12:49 +0200)]
mkswap: zap bootbits on regular files

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswapon: move DELETED_SUFFIX to include/pathnames.h
Karel Zak [Fri, 2 Apr 2010 09:43:36 +0000 (11:43 +0200)]
swapon: move DELETED_SUFFIX to include/pathnames.h

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomkswap: move write_all() to include/writeall.h
Karel Zak [Thu, 1 Apr 2010 14:17:17 +0000 (16:17 +0200)]
mkswap: move write_all() to include/writeall.h

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: avoid probing CDs for RAID
M.S.Colclough [Wed, 31 Mar 2010 16:11:00 +0000 (18:11 +0200)]
libblkid: avoid probing CDs for RAID

RAID probing of CD/DVD can yield errors because of well-known problem
in reading the end of the disk with some disk/drive combinations.
Borrow CD detection method from udev and skip the RAID tests for
these devices.

[kzak@redhat.com: - check for linux/cdrom.h in ./configure
                  - add #ifdef around the ioctl call
                  - call the ioctl for block devices only]

Signed-off-by: Mark Colclough <m.s.colclough@bham.ac.uk>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblockdev: reduce usage text width
Francesco Cosoleto [Fri, 26 Mar 2010 00:13:29 +0000 (01:13 +0100)]
blockdev: reduce usage text width

Use spaces in usage text instead of tabs and reduce the distance between
option names and descriptions.

This helps to minimize problems due to limited number of columns and
translated texts which take up more space than English.

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
14 years agofdisk: replace bzero with memset
Jon Ringle [Fri, 26 Mar 2010 02:42:52 +0000 (22:42 -0400)]
fdisk: replace bzero with memset

Work on this was done in commit c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed,
however a couple of bzero call sites were missed

Signed-off-by: Jon Ringle <jon@ringle.org>
14 years agodocs: update tests/README
Karel Zak [Wed, 31 Mar 2010 15:18:23 +0000 (17:18 +0200)]
docs: update tests/README

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agotests: added tests against strtosize
Yann Droneaud [Wed, 31 Mar 2010 14:51:52 +0000 (16:51 +0200)]
tests: added tests against strtosize

- test empty string, white spaces
- test hexadecimal

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
14 years agobuild-sys: improved check for fallocate()
Yann Droneaud [Wed, 31 Mar 2010 14:14:04 +0000 (16:14 +0200)]
build-sys: improved check for fallocate()

With glibc 2.10 on a 32bits system, fallocate64() function is not
exported. This a problem, since _FILE_OFFSET_BITS is set to 64 and
fallocate() is redirected to fallocate64().
Sadly, AC_CHECK_FUNC() doesn't catch such problem, since it's overriding
the function prototype.

See this for references:
http://sources.redhat.com/ml/libc-hacker/2009-05/msg00003.html

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
14 years agotests: use POSIX locale
Yann Droneaud [Wed, 31 Mar 2010 14:48:39 +0000 (16:48 +0200)]
tests: use POSIX locale

Since not everyone have en_US.UTF-8 locale, default to POSIX locale.
This changes default sort order, so some expected results were updated.

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
14 years agopartx: fix infinite loop
Karel Zak [Wed, 31 Mar 2010 14:38:51 +0000 (16:38 +0200)]
partx: fix infinite loop

On Wed, Mar 24, 2010 at 04:39:35PM -0400, Phillip Susi wrote:
> I noticed that running partx -d /dev/sda hangs so I looked into it
> and it seems that it keeps trying to delete partitions forever.

Reported-By: Phillip Susi <psusi@cfl.rr.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agopartx: do not add nonexistent partitions
Phillip Susi [Wed, 31 Mar 2010 13:52:08 +0000 (15:52 +0200)]
partx: do not add nonexistent partitions

This simple patch fixes partx -a to not add nonexistent zero length
partitions for unused primary partition slots to to the kernel. This
makes partx conform to the usual kernel behavior.

Signed-off-by: Phillip Susi <psusi@cfl.rr.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomkswap: fixed strtoll() usage
Yann Droneaud [Tue, 30 Mar 2010 15:17:56 +0000 (17:17 +0200)]
mkswap: fixed strtoll() usage

- catch empty string
- check against LLONG_MAX and LLONG_MIN instead of ULLONG_MAX and 0

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
14 years agomount: support suffixes for offset= and sizelimit=
Karel Zak [Tue, 30 Mar 2010 14:15:44 +0000 (16:15 +0200)]
mount: support suffixes for offset= and sizelimit=

Note that the offset= and sizelimit= values in /etc/mtab are
always in the final format -- it means without suffix).

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: more robust offset= and sizelimit= parsing
Karel Zak [Tue, 30 Mar 2010 13:08:21 +0000 (15:08 +0200)]
mount: more robust offset= and sizelimit= parsing

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolosetup: support suffixes and hex numbers for --offset and --sizelimit
Karel Zak [Tue, 30 Mar 2010 12:40:33 +0000 (14:40 +0200)]
losetup: support suffixes and hex numbers for --offset and --sizelimit

Reported-By: Liu Aleaxander <aleaxander@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofallocate: support suffixes for --offset and --lenght
Karel Zak [Tue, 30 Mar 2010 12:28:13 +0000 (14:28 +0200)]
fallocate: support suffixes for --offset and --lenght

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomkswap: more robust strtoull() usage
Karel Zak [Tue, 30 Mar 2010 12:10:08 +0000 (14:10 +0200)]
mkswap: more robust strtoull() usage

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agowipefs: support suffixes for --offset
Karel Zak [Tue, 30 Mar 2010 12:05:58 +0000 (14:05 +0200)]
wipefs: support suffixes for --offset

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: support suffixes for -O <offset> and -S <size>
Karel Zak [Tue, 30 Mar 2010 11:58:16 +0000 (13:58 +0200)]
blkid: support suffixes for -O <offset> and -S <size>

for example:  blkid -p -O 17816085KiB /dev/sda

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: add strtosize() function
Karel Zak [Tue, 30 Mar 2010 11:47:33 +0000 (13:47 +0200)]
lib: add strtosize() function

This function

  int strtosize(const char *str, uintmax_t *res)

supports {K,M,G,T,E,P}iB and {K,M,G,T,E,P}B suffixes.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agohwclock: add --predict for predicting RTC reading at a given time
Timo Juhani Lindfors [Sat, 13 Mar 2010 10:28:50 +0000 (12:28 +0200)]
hwclock: add --predict for predicting RTC reading at a given time

Implement new option --predict that predicts what the RTC will read
at a time given by the --date option. This is useful for example if
you need to setup an RTC wakeup time to distant future and want to
account for the RTC drift.

Signed-off-by: Timo Juhani Lindfors <timo.lindfors@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: cleanup man page
Karel Zak [Tue, 23 Mar 2010 13:24:02 +0000 (14:24 +0100)]
blkid: cleanup man page

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agodocs: update TODO file
Karel Zak [Tue, 23 Mar 2010 13:12:35 +0000 (14:12 +0100)]
docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: add -n <list> option
Karel Zak [Tue, 23 Mar 2010 13:06:54 +0000 (14:06 +0100)]
blkid: add -n <list> option

This option allows to restrict low-level probing to the defined list
of superbocks (filesystems or RAIDs). For example:

blkid -p -n ext3,ext4,vfat /dev/sda1
or
blkid -p -n novfat /dev/sda1

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: cleanup -u <list> parsing
Karel Zak [Mon, 22 Mar 2010 14:16:01 +0000 (15:16 +0100)]
blkid: cleanup -u <list> parsing

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: fix -b <sectorsize>
Karel Zak [Fri, 19 Mar 2010 14:56:27 +0000 (15:56 +0100)]
fdisk: fix -b <sectorsize>

The old fdisk (<2.17) does not differentiate between logical and
physical sector size, it uses the <sectorsize> for everything.

Now, we have logical and physical sectors size, but the -b option
changes the logical size only. The second bug is that "fdisk -b <sz>"
does not read topology information (it means that all I/O limits and
physical sector size are 512 (default).

The backwardly compatible bug fix is to override both sizes, logical
and physical if "-b" is used.

In future we can add a special option for physical size only.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agodocs: update TODO file
Karel Zak [Fri, 19 Mar 2010 14:18:42 +0000 (15:18 +0100)]
docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add microsecond resolution for cache entries
Karel Zak [Wed, 17 Mar 2010 13:49:14 +0000 (14:49 +0100)]
libblkid: add microsecond resolution for cache entries

The libblkid library uses stat.st_mtine to detect changes on the
device. The last update time of of the device in the cache is stored
as TIME= tag in the /etc/blkid.tab file.

Linux since 2.5.48 supports nanosecond resolution and more precise
time is available in the stat.st_mtim timespec struct.

This patch add microsecond precision to TIME= tag in the cache file,
old format:

TIME="<sec>"

the new format:

TIME="<sec>.<usec>"

This change is backwardly compatible.

Now, the blkid_verify() function checks stat.st_mtime and
stat.st_mtim.tv_nsec/1000.

Test:

 # e2label /dev/sdb1 AAAA

old version:

 # blkid -s LABEL /dev/sdb1; e2label /dev/sdb1 BBBB; blkid -s LABEL /dev/sdb1
 /dev/sdb1: LABEL="AAAA"
 /dev/sdb1: LABEL="AAAA"

new version:

 # blkid -s LABEL /dev/sdb1; e2label /dev/sdb1 BBBB; blkid -s LABEL /dev/sdb1
 /dev/sdb1: LABEL="AAAA"
 /dev/sdb1: LABEL="BBBB"

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: fix blkdev_find_size()
Karel Zak [Tue, 16 Mar 2010 16:31:39 +0000 (17:31 +0100)]
lib: fix blkdev_find_size()

echo l | fdisk/fdisk /dev/zero

FYI that however now spins forever doing:

offset=3074457345618258603)
    at ../lib/blkdev.c:31
    at ../lib/blkdev.c:151
    at ../lib/blkdev.c:161

Reported-by: Pádraig Brady <P@draigBrady.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: correctly truncate and align translated partition names
Pádraig Brady [Tue, 9 Mar 2010 08:21:35 +0000 (08:21 +0000)]
fdisk: correctly truncate and align translated partition names

* fdisk/Makefile.am: Depend on the mbsalign module.
* fdisk/fdisk.c: Align using mbsalign rather than printf.

[kzak@redhat.com: - use size_t for width to fix gcc warning]

Reported-by: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Signed-off-by: Pádraig Brady <P@draigBrady.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: add #ifndef around min() max() macros
Karel Zak [Tue, 16 Mar 2010 14:24:04 +0000 (15:24 +0100)]
lib: add #ifndef around min() max() macros

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agocal: factor out and update multibyte alignment code
Pádraig Brady [Mon, 8 Mar 2010 18:29:01 +0000 (18:29 +0000)]
cal: factor out and update multibyte alignment code

* include/mbsalign.h: New module interface
* lib/mbsalign.c: Updated implementation synced from coreutils
* include/Makefile.am: Add mbsalign.h
* misc-utils/Makefile.am: Make cal dependent on mbsalign module
* misc-utils/cal.c: Call mbsalign()

[kzak@redhat.com: - use min() macro from c.h]

Signed-off-by: Pádraig Brady <P@draigBrady.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agodocs: update TODO file
Karel Zak [Tue, 16 Mar 2010 13:52:10 +0000 (14:52 +0100)]
docs: update TODO file

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: avoid compilation failure on rawhide
Jim Meyering [Tue, 16 Mar 2010 12:46:58 +0000 (13:46 +0100)]
lib: avoid compilation failure on rawhide

* lib/blkdev.c: Include <sys/stat.h>, for use of S_ISREG.

14 years agomount: automatically detect and loop-mount regular files
Karel Zak [Mon, 15 Mar 2010 16:10:35 +0000 (17:10 +0100)]
mount: automatically detect and loop-mount regular files

This patch allows to automatically create a loop device from a regular
file if a filesystem type is not specified, for example:

   mount /path/disk.img /mnt

If the filesystem type is specified than "-o loop" is required.

Note that there is not a restriction (on kernel side) that prevents
regular file as a mount(2) source argument. A filesystem that is able
to mount regular files could be implemented.

Based on a patch from Adam Jackson <ajax@redhat.com>.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: more explicitly explain fstab usage in mount.8
Karel Zak [Mon, 15 Mar 2010 13:36:22 +0000 (14:36 +0100)]
mount: more explicitly explain fstab usage in mount.8

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: report ambivalent FS detection, improve brute force detection
Karel Zak [Mon, 15 Mar 2010 12:46:43 +0000 (13:46 +0100)]
mount: report ambivalent FS detection, improve brute force detection

The ambivalent probing result should be properly reported and user
should be informed that the problem is possible to bypass by "-t
<type>" or resolved by wipefs(8).

The mount(8) command uses a brute force stage (calls mount(2) for all
/{proc,etc}/fylesystems) if there is not any other way how to detect
the filesystem type. The brute force stage should not be restricted by
libblkid. It's possible that libblkid is not able to detect slightly
corrupted filesystem, but kernel is able to mount such filesystem.

Note that the brute force stage should not be used if libblkid returns
ambivalent probing result. In this case user's intervention is required
(e.g. mount -t <type>).

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agowipefs: cleanup usage() and man page
Karel Zak [Mon, 15 Mar 2010 12:45:03 +0000 (13:45 +0100)]
wipefs: cleanup usage() and man page

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agotests: fix whitespaces
Karel Zak [Sun, 14 Mar 2010 22:18:17 +0000 (23:18 +0100)]
tests: fix whitespaces

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoionice: fix typo
Pierre Hauweele [Sat, 13 Mar 2010 23:50:36 +0000 (00:50 +0100)]
ionice: fix typo

Signed-off-by: Pierre Hauweele <antegallya@gmail.com>
14 years agolibblkid: fix infinite loop when probe chain bails out early
Colin Watson [Sat, 13 Mar 2010 00:46:35 +0000 (00:46 +0000)]
libblkid: fix infinite loop when probe chain bails out early

The superblocks probe bails out early with no results in some cases.  If
this happens, blkid_do_probe needs to go to the next chain, rather than
entering an infinite loop calling superblocks_probe over and over again.

[kzak@redhat.com: - print debug message always when leaving
                    superblocks_probe()]

Addresses: https://bugs.launchpad.net/bugs/528073
Signed-off-by: Colin Watson <cjwatson@canonical.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: remove "0x" prefix from DRBD UUID
Karel Zak [Thu, 11 Mar 2010 14:52:54 +0000 (15:52 +0100)]
libblkid: remove "0x" prefix from DRBD UUID

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: improve ZFS detection and add LABEL and UUID extraction
Andreas Dilger [Thu, 11 Mar 2010 14:16:46 +0000 (15:16 +0100)]
libblkid: improve ZFS detection and add LABEL and UUID extraction

Improve ZFS uberblock detection to loop over multiple uberblocks,
and detect at least 4 magic values, to avoid random collisions.
It doesn't yet probe the VDEV LABEL at the end of the device, though
it wouldn't be too hard to add it at this point if needed.

Add extraction of the pool name (as LABEL), the VDEV (block device)
guid as UUID_SUB, and pool_guid (volume) as UUID from the nvlist in
the VDEV LABEL.  Do simple sanity checking on the nvlist data values
to avoid overflowing the buffer if they are corrupt in any way.

[kzak@redhat.com: - use %PRIu64 instead %llu]

Signed-off-by: Andreas Dilger <adilger@sun.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: prevent overflow in BeFS
Jeroen Oortwijn [Tue, 9 Mar 2010 22:15:30 +0000 (23:15 +0100)]
libblkid: prevent overflow in BeFS

Prevent overflow by casting values to blkid_loff_t before applying
block shift.

Signed-off-by: Jeroen Oortwijn <oortwijn@gmail.com>
14 years agoumount: add --fake option to umount(8)
Miklos Szeredi [Mon, 8 Mar 2010 18:01:13 +0000 (19:01 +0100)]
umount: add --fake option to umount(8)

Add --fake option to umount(8), which omits calling the actual umount
syscall (and the loop device deletion) but modifies /etc/mtab.  This
is similar to the -f or --fake option to mount(8).

This would allow some simplifications in fuse by allowing it to call
the umount syscall and letting umount(8) just update mtab.

[kzak@redhat.com: - initialize 'res' variable in umount_one() ]

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: properly ignore comments in /etc/filesystems
Mike Frysinger [Sun, 7 Mar 2010 05:16:41 +0000 (00:16 -0500)]
mount: properly ignore comments in /etc/filesystems

The POSIX spec for sscanf() says that whitespace may be matched against 0
bytes which means doing sscanf(" %s") against "#foo" will result in a
match. You can see this behavior by using the verbose options on a garbage
file:

...
mount: you didn't specify a filesystem type for /dev/null
       I will try all types mentioned in /etc/filesystems or /proc/filesystems
Trying #
mount: mount(2) syscall: source: "/dev/null", target: "/", filesystemtype: "#", mountflags: -1058209792, data: (null)
Trying #vfat
mount: mount(2) syscall: source: "/dev/null", target: "/", filesystemtype: "#vfat", mountflags: -1058209792, data: (null)
...

Reported-by: Dave Barton <dave.barton@comodo.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agotests: update fdisk tests
Karel Zak [Thu, 11 Mar 2010 00:06:45 +0000 (01:06 +0100)]
tests: update fdisk tests

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomkswap: don't call blkdev_find_size()
Karel Zak [Thu, 11 Mar 2010 00:04:50 +0000 (01:04 +0100)]
mkswap: don't call blkdev_find_size()

.. it's already called by blkdev_get_size().

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: don't use fstat() in blkid_get_dev_size()
Karel Zak [Wed, 10 Mar 2010 23:59:47 +0000 (00:59 +0100)]
libblkid: don't use fstat() in blkid_get_dev_size()

We already use fstat() in blkdev_get_size().

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: use fstat() as fallback in blkdev_get_size()
Karel Zak [Wed, 10 Mar 2010 23:59:04 +0000 (00:59 +0100)]
lib: use fstat() as fallback in blkdev_get_size()

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: use unmangle/mangle() from lib
Karel Zak [Wed, 10 Mar 2010 23:27:35 +0000 (00:27 +0100)]
mount: use unmangle/mangle() from lib

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswapon: use unmangle() for filenames from /proc/swaps
Karel Zak [Wed, 10 Mar 2010 22:59:33 +0000 (23:59 +0100)]
swapon: use unmangle() for filenames from /proc/swaps

linux kernel encodes all garbage in filenames by mangle() function. We
need to unmagle() to get the real filenames.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolib: add mangle.c for mtab (fstab or swaps) encoding
Karel Zak [Wed, 10 Mar 2010 22:54:11 +0000 (23:54 +0100)]
lib: add mangle.c for mtab (fstab or swaps) encoding

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswapon: remove " (deleted)" from filenames from /proc/swaps
Karel Zak [Wed, 10 Mar 2010 22:08:26 +0000 (23:08 +0100)]
swapon: remove " (deleted)" from filenames from /proc/swaps

The filenames in /proc/swaps are generated by seq_path() and this
function uses __d_path() from fs/dcache.c. The filename could
generated with " (deleted)" suffix. We need real filenames without
the suffix.

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=562403
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add blkid_probe_get_{offset,fd} functions
Karel Zak [Wed, 10 Mar 2010 14:50:45 +0000 (15:50 +0100)]
libblkid: add blkid_probe_get_{offset,fd} functions

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoliblkid: move getsize.c code to lib/
Karel Zak [Wed, 10 Mar 2010 14:41:40 +0000 (15:41 +0100)]
liblkid: move getsize.c code to lib/

.. and cleanup blkdev_get_size() usage in libblkid.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: reset BLKID_TINY_DEV flag in blkid_probe_set_device
Pascal Terjan [Wed, 10 Mar 2010 10:08:02 +0000 (11:08 +0100)]
libblkid: reset BLKID_TINY_DEV flag in blkid_probe_set_device

Signed-off-by: Pascal Terjan <pterjan@mandriva.com>
14 years agolibblkid: fix display of device size
Karel Zak [Wed, 10 Mar 2010 10:08:01 +0000 (11:08 +0100)]
libblkid: fix display of device size

blkid_loff_t is int64 so use %jd not %zd in debug

Reported-by: Pascal Terjan <pterjan@mandriva.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: more robust minix probing
Karel Zak [Mon, 8 Mar 2010 12:05:09 +0000 (13:05 +0100)]
libblkid: more robust minix probing

Unfortunately, it's still possible to interpret some parts of ext3
filesystem as minix superblock ;-(

So, the most robust is to check for the extN magic string in minix
probing function.

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=570606
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: cleanup usage of empty topology values
Karel Zak [Wed, 3 Mar 2010 14:01:44 +0000 (15:01 +0100)]
libblkid: cleanup usage of empty topology values

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: support alignment_offset=-1
Karel Zak [Wed, 3 Mar 2010 12:12:02 +0000 (13:12 +0100)]
libblkid: support alignment_offset=-1

Unfortunately, Linux kernel uses "signed int" for alignment_offset and
the offset could be -1 for devices with undefined alignment (if no
compatible sizes and alignments exist for stacked devices).

There is no way how libblkid caller can respond to the value -1, so
we are going to hide this corner case...

TODO: maybe we can export an extra boolean value 'misaligned' rather
      then complete hide this problem. We will see...

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agomount: posix option of vfat is obsolete
Yoshihiro Takahashi [Mon, 1 Mar 2010 10:43:02 +0000 (11:43 +0100)]
mount: posix option of vfat is obsolete

Summary of changes from v2.5.42 to v2.5.43
[PATCH] removes posix option of fat (3/5)
  This removes the posix option of vfat. The current posix options works
  only as an alias of name_check=s.

Signed-off-by: Yoshihiro Takahashi <ytakahashi@miraclelinux.com>
14 years agolscpu: fix cpuid opcode detection
Henne Vogelsang [Mon, 1 Mar 2010 10:35:54 +0000 (11:35 +0100)]
lscpu: fix cpuid opcode detection

Fixes commit c9239f23acdc8b50f8bcbfadf967c6a490fd4693. The author
didn't care for matching constraints when resorting the register
constraints.  The eax register (with the cpuid opcode) is now in
operand 1, not zero anymore.

Signed-off-by: Henne Vogelsang <hvogel@opensuse.org>
14 years agoldattach: prints help to stdout
Karel Zak [Mon, 1 Mar 2010 09:51:12 +0000 (10:51 +0100)]
ldattach: prints help to stdout

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoldattach: add --iflag command line option
Tilman Schmidt [Mon, 1 Mar 2010 09:45:47 +0000 (10:45 +0100)]
ldattach: add --iflag command line option

Add a command line option '-i' / '--iflag' for setting or clearing
input flags on the serial device before attaching the line discipline.

[kzak@redhat.com: - use generic functions for work with iflags table
                  - add list of iflags to usage/help output
                  - move iflags parsing to separate function]

Impact: added functionality
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoldattach: create a generic functions for name=value tables
Karel Zak [Mon, 1 Mar 2010 09:25:55 +0000 (10:25 +0100)]
ldattach: create a generic functions for name=value tables

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: fix 'p' output for sun label
Karel Zak [Fri, 26 Feb 2010 15:06:18 +0000 (16:06 +0100)]
fdisk: fix 'p' output for sun label

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agowipefs: fix license (GPL -> GPLv2+)
Karel Zak [Tue, 23 Feb 2010 13:13:28 +0000 (14:13 +0100)]
wipefs: fix license (GPL -> GPLv2+)

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: swap VTOC values for warning messages
Karel Zak [Fri, 19 Feb 2010 15:11:49 +0000 (16:11 +0100)]
fdisk: swap VTOC values for warning messages

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: improve Sun VTOC
Karel Zak [Fri, 19 Feb 2010 13:54:25 +0000 (14:54 +0100)]
libblkid: improve Sun VTOC

It seems that for example GNU Parted is able to generate Sun VTOC with
empty sanity, version and nparts fields. But there is still useful
info about partition flags in such VTOC.

This change makes libblkid Sun PT parser compatible with Sun PT
parser in Linux kernel.

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: fix blkid_probe_lookup_value() usage
Karel Zak [Fri, 19 Feb 2010 09:15:11 +0000 (10:15 +0100)]
blkid: fix blkid_probe_lookup_value() usage

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: encode PART_ENTRY_TYPE
Karel Zak [Thu, 18 Feb 2010 22:04:22 +0000 (23:04 +0100)]
blkid: encode PART_ENTRY_TYPE

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add PART_ENTRY_{SCHEME,NUMBER}
Karel Zak [Thu, 18 Feb 2010 22:01:38 +0000 (23:01 +0100)]
libblkid: add PART_ENTRY_{SCHEME,NUMBER}

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add support for partition flags/attributes
Karel Zak [Thu, 18 Feb 2010 21:53:44 +0000 (22:53 +0100)]
libblkid: add support for partition flags/attributes

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add blkid_partition_set_type()
Karel Zak [Thu, 18 Feb 2010 21:28:41 +0000 (22:28 +0100)]
libblkid: add blkid_partition_set_type()

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agosfdisk: make sure writes make it to disk in write_partitions()
Bryn M. Reeves [Thu, 18 Feb 2010 20:39:22 +0000 (21:39 +0100)]
sfdisk: make sure writes make it to disk in write_partitions()

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=565946
Signed-off-by: Bryn M. Reeves <bmr@errorists.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: export ID_PART_ENTRY_* variables for udev
Karel Zak [Thu, 18 Feb 2010 15:46:56 +0000 (16:46 +0100)]
blkid: export ID_PART_ENTRY_* variables for udev

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add support for PART_ENTRY_* values
Karel Zak [Thu, 18 Feb 2010 15:38:59 +0000 (16:38 +0100)]
libblkid: add support for PART_ENTRY_* values

blkid(8) will be replacement for devkit-disks-part-id, so we have to
be able to found entry in partition table for requested partition.

This functionality is enabled by BLKID_PARTS_ENTRY_DETAILS flag
(see blkid_probe_set_partitions_flags() for more details).

This patch also add a new public function blkid_partlist_devno_to_partition().

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: don't probe for nested PT on tiny disks (<=1.44MiB)
Karel Zak [Thu, 18 Feb 2010 15:19:31 +0000 (16:19 +0100)]
libblkid: don't probe for nested PT on tiny disks (<=1.44MiB)

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: add generic functions for sysfs attributes
Karel Zak [Thu, 18 Feb 2010 10:09:46 +0000 (11:09 +0100)]
libblkid: add generic functions for sysfs attributes

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agolibblkid: fix ZSF detection
Andreas Dilger [Wed, 17 Feb 2010 09:21:27 +0000 (10:21 +0100)]
libblkid: fix ZSF detection

Fix the ZFS device detection by looking at multiple uberblocks to see
if any are present, rather than looking for the ZFS boot block which
is not always present.

There may be up to 128 uberblocks, but the first 4 are not written to
disk on a newly-formatted filesystem so check several of them at
different offsets within the uberblock array.

[kzak@redhat.com: - port e2fsprogs patch to util-linux-ng]

Signed-off-by: Andreas Dilger <adilger@sun.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoswapon: fix swapsize calculation
Karel Zak [Tue, 16 Feb 2010 12:48:09 +0000 (13:48 +0100)]
swapon: fix swapsize calculation

Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agoblkid: report open() errors in low-level probing
Karel Zak [Tue, 16 Feb 2010 08:43:26 +0000 (09:43 +0100)]
blkid: report open() errors in low-level probing

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: don't use 1MiB grain on small devices
Karel Zak [Mon, 15 Feb 2010 15:46:05 +0000 (16:46 +0100)]
fdisk: don't use 1MiB grain on small devices

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agotests: update fdisk tests
Karel Zak [Mon, 15 Feb 2010 15:07:44 +0000 (16:07 +0100)]
tests: update fdisk tests

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: use 1MiB offset and grain always when possible
Karel Zak [Mon, 15 Feb 2010 14:55:22 +0000 (15:55 +0100)]
fdisk: use 1MiB offset and grain always when possible

It would be nice to minimize dependence between the disk layout and
disk topology. We have to follow disk topology for alignment_offset
and huge (> 1MiB) I/O sizes only. For all others disks we can use 1MiB
grain and 1MiB offset.

Reported-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: add -c option (switch off DOS mode)
Karel Zak [Mon, 15 Feb 2010 13:39:30 +0000 (14:39 +0100)]
fdisk: add -c option (switch off DOS mode)

 * add -c to allows to switch off DOS mode from command line

 * recommend sectors (command 'u' or option -u)

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: fix ALIGN_UP
Karel Zak [Mon, 15 Feb 2010 13:06:56 +0000 (14:06 +0100)]
fdisk: fix ALIGN_UP

Signed-off-by: Karel Zak <kzak@redhat.com>
14 years agofdisk: fallback for topology values
Karel Zak [Mon, 15 Feb 2010 12:29:04 +0000 (13:29 +0100)]
fdisk: fallback for topology values

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