summaryrefslogtreecommitdiff
path: root/libmount/src
AgeCommit message (Collapse)AuthorFilesLines
2012-11-15libmount: more robust tab filter usageKarel Zak2-2/+8
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-11-08libmount: convert /dev/root from mountinfo to the device nameKarel Zak1-5/+40
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-11-08libmount: add private mnt_get_kernel_cmdline_option()Karel Zak2-0/+93
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-10-24libmount: support loopdevs in mnt_table_is_fs_mounted()Karel Zak1-2/+28
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-10-23libmount: tiny refactoring in mnt_table_is_fs_mounted()Karel Zak1-27/+27
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-10-22libmount, eject: replace index() and rindex() with strrch() or strrchr()Sami Kerola1-2/+2
Both index() and rindex() are legacy functions which may be withdrawn in a future. Reference: http://pubs.opengroup.org/onlinepubs/009695399/functions/index.html Reference: http://pubs.opengroup.org/onlinepubs/009695399/functions/rindex.html Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-10-15libmount: fixed comment about paramRaul Gutierrez Segales1-1/+1
Signed-off-by: Raul Gutierrez Segales <rgs@itevenworks.net>
2012-10-15libmount: don't use umount optimization for -l or -fKarel Zak1-1/+3
The options -l (lazy) and -f (force) means that the mountpoint may be unreadable (for example because NFS server is unreadable). So we should not try to be smart in this case and we should try to minimize number of situations when stat() or readlink() is used for the mountpoint. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-10-05libmount: fix umount file.imgKarel Zak1-6/+10
The umount optimization (commit 9cc03553f7b8494c7193024eec6e13b903eb2eec) has to be disabled if the umount argument is not a directory. Reported-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-10-02textual: typo fixesGilles Espinasse2-3/+3
Signed-off-by: Gilles Espinasse <g.esp@free.fr>
2012-09-26libmount: don't setup new loopdev on remount with regular mtabKarel Zak1-2/+2
[chroot-i486] root:/tmp$ mount -oloop /tmp/blob /tmp/mnt [chroot-i486] root:/tmp$ mount -o remount,loop,ro /tmp/mnt [chroot-i486] root:/tmp$ mount /dev/loop0 on /tmp/mnt type ext2 (ro,loop) [chroot-i486] root:/tmp$ losetup -a /dev/loop0: [2051]:306957 (/tmp/blob) /dev/loop1: [0005]:2218 (/dev/loop0) [chroot-i486] root:/tmp$ umount /tmp/mnt umount: /tmp/mnt: filesystem umounted, but mount(8) failed: Device or resource busy [chroot-i486] root:/tmp$ losetup -d /dev/loop1 [chroot-i486] root:/tmp$ losetup -d /dev/loop0 Reported-by: g.esp@free.fr Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-25libmount: improve debug messageKarel Zak1-1/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-25libmount: optimize mtab and utab parsing in umountKarel Zak4-1/+112
create 8000 NFS mountpoints: #!/bin/bash mount=/tmp/mount if [ ! -d $mount ]; then mkdir -p $mount fi for dir in {1..8000}; do if [ ! -d $mount/$dir ]; then mkdir -p $mount/$dir fi echo mount $dir mount -t nfs 127.0.0.1:/ $mount/$dir done old version: time ./umount /tmp/mount/2255 real 0m1.254s user 0m1.002s sys 0m0.238s new version: time ./umount /tmp/mount/2244 real 0m0.332s user 0m0.111s sys 0m0.218s Reported-by: chenditang <chendt.fnst@cn.fujitsu.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-21libmount: user-mounted loopback fs cannot be unmounted by userKarel Zak1-1/+1
Addresses: https://bugs.archlinux.org/task/31624 Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-18libmount: append loop option when automatically create loopdevKarel Zak1-1/+5
The loop option is optional, mount(8) is able to detect that the source path is regular file (image) with known filesystem -- then a loop device is automatically created. In this case we have to store "loop" option to mtab on systems without autoclear loopdev flag. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-18libmount: detach loopdev on umount if loop option in mtabKarel Zak1-0/+4
[chroot-i486] root:/$ mount --version mount from util-linux 2.22 (libmount 2.22.0: debug) [chroot-i486] root:/$ losetup -a [chroot-i486] root:/$ mount -oloop /tmp/foo_fs /tmp/bar_dir [chroot-i486] root:/$ umount /tmp/foo_fs [chroot-i486] root:/$ losetup -a /dev/loop0: [2051]:387175 (/tmp/foo_fs) Reported-by: g.esp@free.fr Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-12libmount: don't remove user= when executed by rootKarel Zak1-8/+4
The original mount(8) allows to store arbitrary user= option to mtab file if called by root user. For example: # mount -f foo /bar -t xxx -o rw,user=kzak the new mount removes the 'user=' and 'users' options at all for root user. This is regression. The original functionality is necessary by 'sshfs' where fuse writes to mtab file by mount(8). Reported-by: Juergen Daubert <jue@jue.li> (and 'horrorStruck' on IRC) Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-12libmount: segfaults if neither /etc/filesystems nor/proc/filesystems existsKarel Zak2-0/+7
Reported-by: Juergen Daubert <jue@jue.li> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-11mount: losetup: remove obsolete encryption supportLudwig Nussel1-18/+4
kernel cryptoloop is deprecated since ages and support for cryptoloop in util-linux is incomplete/broken. - no password hashing - last 8 bit of key are always set to zero - no binary keys possible (stops reading key at \n and \0) In the past some Distros added the above features with patches. So remove cryptoloop support from util-linux completely to make sure people won't try using it. Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-10libmount: improve mnt_table_get_root_fs() docsKarel Zak1-1/+12
Fix info about return value, improve description. Reported-by: Amit <amit.uttam@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-09-04libmount: use O_CLOEXEC everywhereKarel Zak2-4/+4
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-08-27libmount: remount does not add entry to mtab fileKarel Zak1-12/+15
# mount -n -o ro /dev/sda1 / # mount -o remount,rw /dev/sda1 / For the backward compatibility the command mount(8) should to add a new entry to the file /etc/mtab on remount if the original entry not found (because previous mount has been called with -n). Reported-by: <frinnst> on IRC Signed-off-by: Karel Zak <kzak@redhat.com>
2012-08-24libmount: rewrite mnt_table_is_fs_mounted() to be less aggressiveKarel Zak2-24/+52
The old implementation always canonicalizes target (mountpoint) path. It's better to postpone this operation until the path is really necessary (usually it's unnecessary), because readlink() on mountpoint may trigger automounts. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-08-02build-sys: don't compile lib{mount,blkid} tests when --disable-static specifiedKarel Zak1-0/+3
The tests often depend on private (non-API) library functions. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-08-01libmount: deduplicate SELinux mount optionsKarel Zak1-0/+9
We already have a clue about SELinux specific mount options in libmount, so it makes sense to deduplicate the options as Linux kernel does not support duplicate SELinux options. (SELinux kernel stuff somehow ignores standard Linux mount conventions...) Requested-by: Niels de Vos <ndevos@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2012-08-01libmount: add mnt_optstr_deduplicate_option()Karel Zak3-9/+73
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-30build-sys: move tests to check_PROGRAMSKarel Zak1-1/+1
Thanks to Mike Frysinger. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-26libmount: add noreturn function attributeSami Kerola1-1/+1
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-07-26libmount: fix shadow declarationSami Kerola1-1/+1
libmount/src/tab_update.c:203:8: warning: declaration of 'rc' shadows a previous local [-Wshadow] libmount/src/tab_update.c:159:6: warning: shadowed declaration is here [-Wshadow] Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-07-26libmount: fix compiler warning [-Wsign-compare]Karel Zak1-1/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-18libmount: check VFS mount options in mnt_diff_tables()Karel Zak1-3/+5
after "-o remount,ro" in unshared namespace is the original VFS entry still read-write: original: 42 21 8:2 / /boot rw,relatime - ext4 /dev/sda2 ro,user_xattr,acl,barrier=1,data=ordered unshared + ro remount: 78 51 8:2 / /boot ro,relatime - ext4 /dev/sda2 ro,user_xattr,acl,barrier=1,data=ordered Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-17libmount: allow to disable swap between source and targetKarel Zak5-3/+34
In some cases (for example if only one mount argument is given) may be mount request ambivalent: # mount /foo and fstab: /dev/sda5 /foo rw 0 0 /foo /bar bind 0 0 The libmount allows to swap between source and target (if source is not LABEL or UUID) by default. The new function mnt_context_disable_swapmatch() allows to disable this feature. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-12libmount: rename mnt_context_fstab_applied to mnt_context_tab_appliedKarel Zak3-5/+5
The function is also usable in umount to detect is mtab has been applied. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-07-09docs: fix typos found by misspellingsBernhard Voelker2-2/+2
The tool misspellings (https://github.com/lyda/misspell-check) detected several typos. Command used: $ git ls-files | grep -v ^po/ | misspellings -f - * Documentation/releases/v2.18-ReleaseNotes: Fix typo in news entry. * NEWS: Likewise. * config/texinfo.tex: Fix typo in comments. * libmount/src/context.c: Fix typo in comment. * libmount/src/fs.c: Likewise. * login-utils/login.c: Likewise. * login-utils.su.1: Fix typo in man page. * sys-utils/chcpu.c: Fix typo in error message. Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
2012-06-28libmount: save task ID for mountinfo tilesKarel Zak5-3/+57
Add new function mnt_fs_get_tid() to get task ID for the given filesystem. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-26build-sys: cleanup .gitignore filesKarel Zak1-0/+1
- move all binaries to top-level .gitignore - remove unnecessary */.gitignore files Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-26build-sys: convert lib/ to libcommon.laKarel Zak1-10/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-26build-sys: convert libmount/ to moduleKarel Zak2-98/+143
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-21lib/loopdev: use warn_unused_result forimportant functionsKarel Zak2-3/+6
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-19libmount: improve ifdef HAVE_LIBSELINUX stuffKarel Zak1-2/+11
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-15Merge branch '2012wk23' of git://github.com/kerolasa/lelux-utiliteetitKarel Zak2-3/+4
* '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit: lsblk: use blkdev_scsi_type_to_name() blkdev: add blkdev_scsi_type_to_name() wipefs: use symbolic value for markup mode eject: inform if CD-ROM drive is not ready docs: clean up partx.8 manual include: fix void pointer arithmetics warnings sysfs: fix printf format warnings build: fix unused parameter warnings build: fix redundant redeclaration warnings include: fix spurious list.h warnings uuidd: use output redirection which works [checkbashisms] blkid: fix realloc memory leak [cppcheck] setarch: do not use -1 as array index [cppcheck]
2012-06-15libmount: make some string operations more robustKarel Zak4-5/+10
Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-15libmount: fix trivial typosPetr Uzel1-2/+2
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
2012-06-15libmount: fix read before allocated bufferPetr Uzel1-1/+1
valgrind --leak-check=full ./sys-utils/mount -t cifs //127.0.0.1/users /mnt/smb -o user=root,password=linux .... ==21359== Invalid read of size 1 ==21359== at 0x415AC6: mnt_optstr_remove_option_at (optstr.c:310) ==21359== by 0x416358: mnt_optstr_apply_flags (optstr.c:716) ==21359== by 0x40DFBF: mnt_context_prepare_mount (context_mount.c:86) ==21359== by 0x40EB5A: mnt_context_mount (context_mount.c:782) ==21359== by 0x4058B0: main (mount.c:918) ==21359== Address 0x51cd5bf is 1 bytes before a block of size 10 alloc'd ==21359== at 0x4C297CD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==21359== by 0x4C29957: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==21359== by 0x415780: __mnt_optstr_append_option (optstr.c:188) ==21359== by 0x412822: mnt_fs_append_options (fs.c:764) ==21359== by 0x409288: mnt_context_append_options (context.c:733) ==21359== by 0x4053F0: main (mount.c:776) Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
2012-06-15libmount: plug a memory leak in exec_helper()Petr Uzel1-0/+1
valgrind --leak-check=full ./sys-utils/mount -t cifs //127.0.0.1/users /mnt/smb -o user=root,password=linux .... ==21359== 28 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==21359== at 0x4C298B2: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==21359== by 0x415780: __mnt_optstr_append_option (optstr.c:188) ==21359== by 0x415CB5: mnt_optstr_set_option (optstr.c:387) ==21359== by 0x40D778: do_mount (context_mount.c:192) ==21359== by 0x40E6A9: mnt_context_do_mount (context_mount.c:685) ==21359== by 0x40EB7B: mnt_context_mount (context_mount.c:786) ==21359== by 0x4058B0: main (mount.c:918) Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
2012-06-14libmount: don't use nosuid,noexec,nodev for cifs user=fooKarel Zak2-6/+32
mount -t cifs //127.0.0.1/users /mnt/smb -o user=root,password=linux is incorrectly translated to mount.cifs -o noexec,nosuid,nodev,user=root,password=linux ... The command mount(8) should be sensitive to "user" (without "=<name>") only. The correct cifs command line is: mount.cifs -o user=root,password=linux Addresses: https://bugzilla.novell.com/show_bug.cgi?id=766157 Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-14libmount: don't generate empty option stringsKarel Zak2-1/+14
mount -t foo something /mnt/test -o user=root,password=linux generates "rw,noexec,nosuid,nodev,password=linux,,user=root" options string for /sbin/mount.foo, the ",," is incorrect. Signed-off-by: Karel Zak <kzak@redhat.com>
2012-06-11build: fix unused parameter warningsSami Kerola1-1/+4
pager.c:203:14: warning: unused parameter 'argc' [-Wunused-parameter] pager.c:203:26: warning: unused parameter 'argv' [-Wunused-parameter] randutils.c:108:14: warning: unused parameter 'argc' [-Wunused-parameter] randutils.c:108:26: warning: unused parameter 'argv' [-Wunused-parameter] optstr.c:774:37: warning: unused parameter 'optstr' [-Wunused-parameter] optstr.c:774:51: warning: unused parameter 'value' [-Wunused-parameter] optstr.c:774:65: warning: unused parameter 'valsz' [-Wunused-parameter] optstr.c:774:79: warning: unused parameter 'next' [-Wunused-parameter] Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-06-11build: fix redundant redeclaration warningsSami Kerola1-2/+0
env.c:24:15: warning: redundant redeclaration of 'environ' [-Wredundant-decls] su.c:81:15: warning: redundant redeclaration of 'environ' [-Wredundant-decls] fstab.c:581:14: warning: redundant redeclaration of 'strsignal' [-Wredundant-decls] kill.h:1:13: note: previous declaration of 'get_pids' was here kill.c:152:13: warning: redundant redeclaration of 'get_pids' [-Wredundant-decls] kill.c:142:5: warning: redundant redeclaration of 'main' [-Wredundant-decls] getopt.c:89:5: warning: redundant redeclaration of 'main' [-Wredundant-decls] agetty.c:536:15: warning: redundant redeclaration of 'optarg' [-Wredundant-decls] agetty.c:537:13: warning: redundant redeclaration of 'optind' [-Wredundant-decls] script.c:161:13: warning: redundant redeclaration of 'optind' [-Wredundant-decls] wall.c:96:13: warning: redundant redeclaration of 'optind' [-Wredundant-decls] libmount.h:362:26: note: previous declaration of 'mnt_update_get_fs' was here libmount.h:454:26: note: previous declaration of 'mnt_context_get_fs' was here mountP.h:383:26: warning: redundant redeclaration of 'mnt_context_get_fs' [-Wredundant-decls] mountP.h:398:26: warning: redundant redeclaration of 'mnt_update_get_fs' [-Wredundant-decls] Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-06-05libmount: trim leading commas from each options stringDave Reisner1-0/+5
Fixes a bug in option string parsing wherein a line such as: ro,relatime,,nosuid,nodev Will be seen as only the tokens "ro" and "relatime" after the parser encounters a zero length (and erroneously declared NULL) option. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-29 15:19:42 +0000