Dear NILFS team, Thanks for your hard work and for new release of nilfs-tools. I'd like to share two patches (attached) to fix some minor problems that I've noticed: * man.patch (with minor man pages corrections) * fhs.patch (to install nilfs-* executables to "/usr/sbin" instead of "/sbin" due to library dependencies in "/usr"). Please review and apply (if appropriate). Also please CC to me as I'm not subscribed. Thank you. -- All the best, Dmitry Smirnov GPG key : 4096R/53968D1B
Last-Update: 2014-04-11
Forwarded: yes
Author: Dmitry Smirnov <onlyjob@xxxxxxxxxxxxxx>
Description: install nilfs-* executables to /usr/sbin:
Fixes the following problems (thanks, `adequate`):
bin-or-sbin-binary-requires-usr-lib-library
/sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfscleaner.so.0
/sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
/sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
/sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0
/sbin/nilfs-tune => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
/sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
/sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0
--- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,10 @@
AC_SYS_LARGEFILE
# Install directories
AC_PREFIX_DEFAULT([/usr])
-AC_SUBST([sbindir], [/sbin])
+AC_SUBST([root_sbindir], [/sbin])
+AC_SUBST([sbindir], [${prefix}/sbin])
AC_SUBST([sysconfdir], [/etc])
AC_SUBST([localstatedir], [/var])
AC_CONFIG_FILES([Makefile
--- a/sbin/mkfs/Makefile.am
+++ b/sbin/mkfs/Makefile.am
@@ -5,9 +5,9 @@
LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \
$(top_builddir)/lib/libmountchk.la \
$(top_builddir)/lib/libcrc32.la
-sbin_PROGRAMS = mkfs.nilfs2
+root_sbin_PROGRAMS = mkfs.nilfs2
mkfs_nilfs2_SOURCES = mkfs.c bitops.c mkfs.h
EXTRA_DIST = .gitignore
--- a/sbin/mount/Makefile.am
+++ b/sbin/mount/Makefile.am
@@ -10,9 +10,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = $(top_builddir)/lib/librealpath.la \
$(top_builddir)/lib/libcleanerexec.la $(LIB_MOUNT) $(LIB_SELINUX)
-sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
+root_sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
if CONFIG_LIBMOUNT
COMMONSOURCES += mount_attrs.c
Last-Update: 2014-04-11 Forwarded: yes Author: Dmitry Smirnov <onlyjob@xxxxxxxxxxxxxx> Description: minor man pages lintianisation spelling-error-in-manpage hyphen-used-as-minus-sign --- a/man/nilfs-clean.8 +++ b/man/nilfs-clean.8 @@ -19,9 +19,9 @@ sent to and performed on the \fBnilfs_cleanerd\fP(8) program. If no commands are specified, \fBnilfs-clean\fP just triggers a one-pass cleaning. .PP -When \fIdevice\fP is ommitted, \fBnilfs-clean\fP selects an active +When \fIdevice\fP is omitted, \fBnilfs-clean\fP selects an active NILFS2 file system in the system. .PP This command is valid only for mounted NILFS2 file systems, and will fail if the \fIdevice\fP has no active mounts. --- a/man/umount.nilfs2.8 +++ b/man/umount.nilfs2.8 @@ -41,9 +41,9 @@ Verbose mode. .SH THE LOOP DEVICE .B umount.nilfs2 will free the loop device (if any) associated with the mount, in case -it finds the option `loop=...' in \fI/etc/mtab\fP. The -d option, +it finds the option `loop=...' in \fI/etc/mtab\fP. The \-d option, which also allows \fBumount\fP(8) to free the loop device without the `loop=...' option, is not supported. .SH AUTHOR .B umount.nilfs2
Attachment:
signature.asc
Description: This is a digitally signed message part.
