Miklos Szeredi [Fri, 27 Aug 2010 14:58:44 +0000 (16:58 +0200)]
mount: handle filesystems with subtype
Linux can handle filesystem types with "MAINTYPE.SUBTYPE" format,
where the main type determines the actual filesystem driver while the
subtype can be interpreted by the filesystem itself.
When searching for mount helpers mount(8) and umount(8) should also
interpret such types, falling back to (u)mount.MAINTYPE if
(u)mount.MAINTYPE.SUBTYPE doesn't exist.
This patch implements this, passing the type with "-t TYPE"
to the mount program in this case.
Reported-by: Josef Bacik <josef@redhat.com>
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=625064 Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Karel Zak [Fri, 27 Aug 2010 10:22:27 +0000 (12:22 +0200)]
mount: sanity check mount flags for MS_PROPAGATION
mount(8) reuses mount flags from fstab/mtab, the problem is that for
MS_PROPAGATION operations kernel incorrectly evaluates mount flags if
the flags contains any non-propagation stuff (e.g. MS_RDONLY). For
example --make-shared on read-only FS:
# strace -e mount mount --make-shared /mnt/test
mount("/dev/sda1", "/mnt/test", "none", MS_RDONLY|MS_SHARED, NULL) = 0
must be:
# strace -e mount mount --make-shared /mnt/test
mount("/dev/sda1", "/mnt/test", "none", MS_SHARED, NULL) = 0
Reported-by: Valerie Aurora <vaurora@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Command (m for help): n
Command action
e extended
p primary partition (1-4)
p
Partition number (1-4, default 1):
Using default value 1
First sector (256-262143, default 256): 257
Last sector, +sectors or +size{K,M,G} (257-262143, default 262143): +100M
Command (m for help): p
Disk /dev/sdb: 1073 MB, 1073741824 bytes
32 heads, 32 sectors/track, 256 cylinders, total 262144 sectors
Units = sectors of 1 * 4096 = 4096 bytes
Sector size (logical/physical): 4096 bytes / 4096 bytes
I/O size (minimum/optimal): 4096 bytes / 262144 bytes
Disk identifier: 0x16db2bb0
Device Boot Start End Blocks Id System
/dev/sdb1 257 25855 102396 83 Linux
Partition 1 does not start on physical sector boundary.
^^^^^^^^
The warning is nonsense. The logical and physical sector size is the
same. It means that every LBA is always aligned to physical sector
boundary.
Note that this bug does not mean that fdisk produces unaligned
partitions. The problem is that fdisk forces to use bigger gaps
between aligned LBAs, for example:
Dima Kogan [Sat, 14 Aug 2010 09:15:47 +0000 (02:15 -0700)]
tailf: fixed timing issue that could cause duplicate data output
The issue is that in roll_file() we fstat() to find the file size, then read()
as much data as we can and then use the previously saved file size to mark our
position. The bug occurs if we read past the file size reported by fstat()
because more data has arrived while we were reading it. The attached patch uses
the current file position as the location marker instead, with some extra logic
to handle tailing truncated files.
[kzak@redhat.com: - fix coding style]
Signed-off-by: Dima Kogan <dkogan@cds.caltech.edu> Signed-off-by: Karel Zak <kzak@redhat.com>
Davidlohr Bueso [Sun, 8 Aug 2010 21:03:56 +0000 (17:03 -0400)]
rev: coding style, various fixes
* Change indentation to 8 characters and coding style, for better reading the code.
* Add some memory allocation error handling.
* Fix memory leaks. In cases when Ctrl-C is used to exit the program,
'p' cannot be freed, so made it a global var, to share between main()
and sig_handler(). Signal handing is necessary to fix some leaks, so
added a very basic, non invasive, mechanism.
Signed-off-by: Davidlohr Bueso <dave@gnu.org> Signed-off-by: Karel Zak <kzak@redhat.com>
The current heuristic for conversion from partition to whole-disk
is based on device names. It's pretty poor. This patch replaces this
code with blkid_devno_to_wholedisk(). This solution is based on
/sys FS and it works for arbitrary partitioned devices.
The another problem is the way how fsck determines stacked devices.
The current code checks device name for "md" prefix only. It does not
care about DM, dm-ccypt, and so on. This patch uses
/sys/block/.../slaves/, but it does not fully resolves dependencies
between all devices. The method is simple -- fsck does not check
stacked devices in parallel with any other device.
Karel Zak [Wed, 18 Aug 2010 07:02:03 +0000 (09:02 +0200)]
agetty: add -s to reuse existing baud rate
For example:
/sbin/agetty -s /dev/ttyS0 9600
will reuse the speed the kernel configured on the port. If the setting
from kernel is useless (tty returns BREAK character) then the baud
rate from command line (9600) is used.
Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=623685 Signed-off-by: Karel Zak <kzak@redhat.com>
Valerie Aurora [Wed, 4 Aug 2010 00:09:19 +0000 (20:09 -0400)]
mount: get most recently mounted fs from /etc/mtab.
I spent most of the day tracking down this subtle remount bug. I
think this is the correct solution but I'd appreciate some
double-checking. I suspect this bug will munge the mount options
whenever you remount a file system mounted on the same mountpoint as
another file system, using the mountpoint as the handle.
mount: get most recently mounted fs from /etc/mtab.
In mount, when using /etc/mtab to lookup a mount entry, get the most
recently mounted entry instead of the first mounted entry. You want
to manipulate the most recent mount, not a covered mount. See comment
to umount_one_bw().
This bug has been util-linux-ng since the first git checkin. It
finally showed up on my system with the change to stop using
SETLOOP_AUTOCLEAR if /etc/mtab is writable (commit af092544). If you
do a remount of a file system mounted on the same dir as another file
system, it will take the options from the first mount and write them
out to /etc/mtab as the options to the second mount - including, in
the case of a loop device, loop=/dev/loop0. Then when you umount the
second mount, it grabs the line from /etc/mtab and tries to tear down
the loop device, which complains because it is still in use by the
first mount.
Reproducible test case (on a system with writable /etc/mtab):
mount -o loop,ro /tmp/ro /mnt
mount -t tmpfs tmpfs /mnt
mount -o remount,ro /mnt
cat /etc/mtab | tail -2
build-sys: drop the getsize test out of Makefile.am
The #ifdef TEST_PROGRAM block was removed with commit 3069624180bac35f1cd468249ddb9dfc91d1b7b1 so there is no point in
keeping the tests declared, as it won't build.
Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Karel Zak [Thu, 29 Jul 2010 12:18:46 +0000 (14:18 +0200)]
mount: fix "mount -a" for auto-clear loopdevs and /proc/mounts
The "mount -a" uses /etc/mtab to detect already mounted file systems
from /etc/fstab -- this check requires the same FS name (1st field)
in fstab and mtab.
On systems with enabled auto-clear loop devies or systems without
regular mtab (symlink to /proc/mounts) there is /dev/loopN rather
than image filename in mtab. For example:
fstab:
/mnt/store/foo.ISO /mnt/image auto defaults 0 0
mtab:
/dev/loop0 /mnt/image iso9960 rw 0 0
We have to scan all available loop devices to check if some of the
devices is not associated with the image file from fstab.
Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=618957 Signed-off-by: Karel Zak <kzak@redhat.com>
Karel Zak [Tue, 20 Jul 2010 09:37:23 +0000 (11:37 +0200)]
mount: don't use auto-clear loopdev if mtab is available
# mount /home/images/floppy.img /mnt/test2
# mount | grep loop
/dev/loop0 on /mnt/test2 type udf (rw)
mount(8) with auto-clear loopdev does not store information about the
original backing file (the image) to /etc/mtab. (Note that this is our
long-term goal, because we want to remove mtab from Linux.)
Unfortunately, losetup(8) is not able to provide full path for the
backing file, because LOOP_GET_STATUS ioctl uses 64 bytes for the
filename...
So, without the information about the backing file in mtab the
information about mapping between the file and the loopdev is
unaccessible from userspace.
From my point of view it would be nice to add all necessary
information about loopdevs to /sys rather than rely on broken
LOOP_GET_STATUS[64] ioctls.
with this patch:
# mount /home/images/floppy.img /mnt/test2
# mount | grep loop# mount | grep loop
/home/images/floppy.img on /mnt/test2 type udf (ro,loop=/dev/loop0)
Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=615389 Signed-off-by: Karel Zak <kzak@redhat.com>
According to a search on the internet, the 200 file number is not a
posix shell feature, since posix shells are only mandated to have 1
through 9. I haven't verified that this claim is right, but, at least
dash doesn't like the 200. So here is a patch for the flock man page
that replaces 200 with 9.
Signed-off-by: Patrice Dumas <pertusus@free.fr> Signed-off-by: Karel Zak <kzak@redhat.com>
Jeff Mahoney [Wed, 7 Jul 2010 08:01:17 +0000 (10:01 +0200)]
swapon: Document btrfs limitation with swapfiles
Btrfs, as of 2.6.35, is unable to allow swapfiles to be used on its
filesystems. This is due to the swapfile implementation wanting to
build an extent map of each block in the file and expecting it to be
static for the life of the swapfile.
Btrfs can't guarantee this and refuses to return the mapping. The
swapfile implementation just makes a comment about there being holes
in the file - but that's how btrfs denies the mapping.
This patch adds a section to the swapon manpage to document it.
Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Mike Frysinger [Thu, 1 Jul 2010 17:41:40 +0000 (13:41 -0400)]
cfdisk: search for ncursesw/ncurses.h
Some distros install the wide version of ncurses side by side with the
non-wide version and place the wide headers in an ncursesw/ subdir. So
detect that behavior and include the right header with cfdisk.
Karel Zak [Thu, 1 Jul 2010 08:43:06 +0000 (10:43 +0200)]
build-sys: explicitly check for slang.h
The slang/slcurses.h contains
#includes <slang.h>
but we don't use -I/usr/include/slang (and this is also missing in
slang.pc), it means that we have manually include the slang.h file
in our configure script.
Note this is Fedora-12, maybe some others distros have more usable
slang headers...
Note that option -v0 is obsolete, and remove the now unneeded comment
about new-style swap areas. Further doublespace sentences, add some
commas and articles, and alphabetize the options.
ipcs: advise translators a different output format
Shared memory status output format need changes but there are backward
compatibility problems. This is a invite to apply in translations the
same style used for the rest of the summaries as well as for the limits
reported by -l option.
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
projects / util-linux / log