summaryrefslogtreecommitdiff
path: root/mount/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2011-01-31Merge remote branch 'origin/master'LaMont Jones1-0/+17
Conflicts: mount/mount.8 mount/mount.c
2011-01-03build-sys: add --enable-libmount-mountKarel Zak1-0/+17
Signed-off-by: Karel Zak <kzak@redhat.com>
2010-12-29Merge remote branch 'origin/master'LaMont Jones1-3/+3
Conflicts: login-utils/Makefile.am mount/lomount.c text-utils/od.1
2010-11-23lib: [strutils] general purpose string handling functionsDavidlohr Bueso1-3/+3
This patch replaces a few functions used throughout the source: * Renames getnum (from schedutils) to strtol_or_err * Moves strtosize (from lib/strtosize.c) * Moves xstrncpy (from include/xstrncpy.h) * Adds strnlen, strnchr and strndup if not available (remove it from libmount utils) A few Makefile.am files were modified to compile accordingly along with trivial renaming in schedutils source code. Signed-off-by: Davidlohr Bueso <dave@gnu.org>
2010-10-18Merge remote branch 'origin/master'LaMont Jones1-1/+1
2010-10-07umount: use strtosize() for offset=Karel Zak1-1/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2010-08-02Merge remote branch 'origin/master'LaMont Jones1-8/+11
Conflicts: mount/Makefile.am sys-utils/ipcs.c tests/ts/blkid/images-fs/befs.img.bz2 tests/ts/blkid/images-fs/ddf-raid.img.bz2
2010-05-24build-sys: replace ../ with $top_srcdirKarel Zak1-8/+11
Signed-off-by: Karel Zak <kzak@redhat.com>
2010-05-14Merge remote branch 'origin/master' into HEADLaMont Jones1-4/+5
Conflicts: lib/fsprobe.c mount/lomount.c
2010-03-30mount: support suffixes for offset= and sizelimit=Karel Zak1-1/+1
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>
2010-03-30losetup: support suffixes and hex numbers for --offset and --sizelimitKarel Zak1-1/+1
Reported-By: Liu Aleaxander <aleaxander@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2010-03-11mount: use unmangle/mangle() from libKarel Zak1-1/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2010-03-10swapon: use unmangle() for filenames from /proc/swapsKarel Zak1-1/+2
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>
2009-11-19Merge remote branch 'upstream/master'LaMont Jones1-7/+5
2009-11-09build-sys: cleanup AM_CFLAGS usageKarel Zak1-3/+3
Signed-off-by: Karel Zak <kzak@redhat.com>
2009-11-06build-sys: fix out-of-source buildKarel Zak1-1/+1
The blkid.h file is generated and stored in $top_builddir. Signed-off-by: Karel Zak <kzak@redhat.com>
2009-11-05build-sys: remove LT_STATIC_LDFLAGSKarel Zak1-1/+1
It was really stupid idea to use *_LDFLAGS for some global variable. Signed-off-by: Karel Zak <kzak@redhat.com>
2009-11-05build-sys: cleanup static buildingKarel Zak1-3/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2009-10-10Merge remote branch 'origin/master'LaMont Jones1-1/+4
2009-09-30build-sys: add --disable-makeinstall-setuidKarel Zak1-1/+4
.. to disable "chmod 4755" for mount and umount. Signed-off-by: Karel Zak <kzak@redhat.com>
2009-07-21Merge commit 'origin/master'LaMont Jones1-8/+0
Conflicts: AUTHORS NEWS config/include-Makefile.am configure.ac mount/lomount.c po/POTFILES.in po/ca.po po/cs.po po/da.po po/de.po po/es.po po/et.po po/eu.po po/fi.po po/fr.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po po/tr.po po/uk.po po/util-linux-ng.pot po/vi.po po/zh_CN.po
2009-05-22mount: (and fsck) remove libvolume_id supportKarel Zak1-8/+0
The libvolume_id is deprecated in favor of libblkid. The libblkid from u-l-ng provides the same functionality as libvolume_id. Signed-off-by: Karel Zak <kzak@redhat.com>
2009-03-20Merge commit 'origin/master'LaMont Jones1-45/+56
Conflicts: NEWS config/include-Makefile.am configure.ac mount/Makefile.am mount/mount.c po/ca.po po/cs.po po/da.po po/de.po po/es.po po/et.po po/eu.po po/fi.po po/fr.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po po/tr.po po/uk.po po/util-linux-ng.pot po/vi.po po/zh_CN.po
2009-03-03swapon: simplify spec to devname conversionKarel Zak1-6/+6
We needn't to use spec_to_devname() and check for pseudo filesystems. The swap{on,off} is always checking for the 'swap' fstype. This patch also removes the dependence on xmalloc.c. Signed-off-by: Karel Zak <kzak@redhat.com>
2009-02-17build-sys: use pkg-config for blkid and volume_idKarel Zak1-3/+3
It seems that blkid.pc from e2fsprogs has been fixed: $ pkg-config --libs blkid -lblkid and the pkg-config does not return any other extra libraries (such -luuid or -ldevmapper). Signed-off-by: Karel Zak <kzak@redhat.com>
2009-02-17Merge branch 'stable/v2.14'LaMont Jones1-2/+8
Conflicts: fdisk/fdisk.c fdisk/partname.c include/blkdev.h mount/fstab.c mount/lomount.c mount/mount.8 mount/umount.c schedutils/chrt.c schedutils/ionice.1 sys-utils/Makefile.am sys-utils/ipcs.c sys-utils/rtcwake.c
2009-02-17mount: generic blkid/volume_id wrapper, use blkid_evaluate_*Karel Zak1-9/+7
* moves the generic libblkid/libvolume_id wrapper (fsprobe.c) from mount/ to lib/. We'll use the wrapper in cfdisk and fsck. The wrapper supports: - obsolete volume_id (udev) - obsolete libblkid (e2fsprogs) - libblkid (util-linux-ng) * mount, umount and swapon when linked against the new libblkid use - low-level probing code to read LABEL, UUID or FSTYPE from a device - high-level blkid_evaluate_spec() to convert LABEL/UUID to devname Signed-off-by: Karel Zak <kzak@redhat.com>
2009-02-13Merge commit 'origin/master'LaMont Jones1-2/+3
2009-02-13build-sys: libtoolize mount/Makefile.amKarel Zak1-36/+52
* cleanup mount/Makefile.am * add {VOLUMEID,BLKID}_CFLAGS -- necessary for pkg-config * add support for linking with in-tree libblkid Signed-off-by: Karel Zak <kzak@redhat.com>
2009-02-11mount: move realpath.c code to lib/Karel Zak1-9/+12
Signed-off-by: Karel Zak <kzak@redhat.com>
2009-01-30Merge commit 'origin/stable/v2.14' into stable/v2.14LaMont Jones1-2/+3
Conflicts: mount/mount.8
2008-12-15Merge commit 'origin/master'LaMont Jones1-7/+2
Conflicts: mount/mount.8
2008-12-12mount: fix mount_static_LDADDKarel Zak1-2/+3
Signed-off-by: Karel Zak <kzak@redhat.com>
2008-12-12mount: fix mount_static_LDADDKarel Zak1-2/+3
Signed-off-by: Karel Zak <kzak@redhat.com>
2008-12-05swapon: add swap format detection and pagesize checkMatthias Koenig1-2/+2
As swap format depends on the pagesize being used, it may happen that the pagesize of the swap space and the current pagesize differ, resulting in swapon to fail when trying to enable such a swap space. In such a case swapon should rather reinitialize the swap space. [kzak@redhat.com: - add blkdev.c to the global swapon_SOURCES - don't try to detect for huge pages on small swap areas (or when read() returns less than MAX_PAGESIZE) - fix fprintf() format string] Co-Author: Olaf Hering <olh@suse.de> Signed-off-by: Matthias Koenig <mkoenig@suse.de> Signed-off-by: Karel Zak <kzak@redhat.com>
2008-11-19build-sys: move pivot_root(8) to sys-utilsKarel Zak1-5/+0
This patch moves pivot_root.{8,c) from mount/ to sys-utils/ directory. There is not ant relation between pivot_root source code and the rest of code in the mount. Signed-off-by: Karel Zak <kzak@redhat.com>
2008-08-11Merge commit 'origin/stable/v2.14' into stable/v2.14LaMont Jones1-2/+8
Conflicts: mount/Makefile.am
2008-08-11mount: add fallback for versionsort()Karel Zak1-2/+8
I was trying to build util-linux-ng on uclibc and it failed | lomount.c: In function 'looplist_next': | lomount.c:223: error: 'versionsort' undeclared (first use in this function) | lomount.c:223: error: (Each undeclared identifier is reported only once | lomount.c:223: error: for each function it appears in.) | make[2]: *** [mount-lomount.o] Error 1 | which is understood because versionsort is GNU extension and uclibc does not implement it. Reported-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
2008-02-21Merge commit 'origin/master'LaMont Jones1-3/+28
Conflicts: mount/lomount.c mount/losetup.8 mount/mount.c
2008-02-18build-sys: add --enable-static-programsStepan Kasal1-3/+28
Add support for static versions of mount, umount, losetup, fdisk, and sfdisk. Co-Author: Karel Zak <kzak@redhat.com> Signed-off-by: Stepan Kasal <skasal@redhat.com>
2007-12-17Merge commit 'origin/master'LaMont Jones1-2/+2
2007-12-17build-sys: use dist_man_MANS instead of man_MANSStepan Kasal1-2/+2
Signed-off-by: Stepan Kasal <skasal@redhat.com>
2007-12-04Merge branch 'stable/v2.13'; commit 'origin/master'LaMont Jones1-1/+1
Conflicts: getopt/getopt.1
2007-11-28mount: cleanup usage of _PATH_*Karel Zak1-1/+1
The macros MOUNTED and MNTTAB are deprecated. This patch standardize and consolidate all path macros and remove mount_paths.h. Signed-off-by: Karel Zak <kzak@redhat.com>
2007-11-21Merge commit 'origin/master'LaMont Jones1-0/+1
2007-11-13build-sys: fix missing deps for swaponMatthias Koenig1-0/+1
Signed-off-by: Matthias Koenig <mkoenig@suse.de>
2007-11-07Merge commit 'origin/master'LaMont Jones1-2/+3
Conflicts: mount/Makefile.am mount/my_dev_t.h
2007-11-08mount: use blkdev_get_size()Karel Zak1-2/+3
Signed-off-by: Karel Zak <kzak@redhat.com>
2007-11-07mount: cleanup KERNEL_VERSION, remove my_dev_t.hKarel Zak1-1/+1
Signed-off-by: Karel Zak <kzak@redhat.com>
2007-10-26Merge commit 'origin/master'LaMont Jones1-1/+2
Conflicts: mount/Makefile.am mount/mount.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 03:54:44 +0000