diff --git a/src/Makefile.am b/src/Makefile.am index 2dbcda2e..7d883a43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,4 @@ -EXTRA_DIST = secaudit.h - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in if FUSE_INTERNAL @@ -11,13 +9,10 @@ FUSE_CFLAGS = $(FUSE_MODULE_CFLAGS) FUSE_LIBS = $(FUSE_MODULE_LIBS) endif -bin_PROGRAMS = ntfs-3g.probe ntfs-3g.usermap ntfs-3g.secaudit -rootbin_PROGRAMS = ntfs-3g +bin_PROGRAMS = ntfs-3g.probe +rootbin_PROGRAMS = ntfs-3g lowntfs-3g rootsbin_DATA = #Create directory -man_MANS = ntfs-3g.8 \ - ntfs-3g.probe.8 \ - ntfs-3g.usermap.8 \ - ntfs-3g.secaudit.8 +man_MANS = ntfs-3g.8 ntfs-3g.probe.8 ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la if REALLYSTATIC @@ -30,21 +25,23 @@ ntfs_3g_CFLAGS = \ -I$(top_srcdir)/include/ntfs-3g ntfs_3g_SOURCES = ntfs-3g.c +lowntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la +if REALLYSTATIC +lowntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static +endif +lowntfs_3g_CFLAGS = \ + $(AM_CFLAGS) \ + -DFUSE_USE_VERSION=26 \ + $(FUSE_CFLAGS) \ + -I$(top_srcdir)/include/ntfs-3g +lowntfs_3g_SOURCES = lowntfs-3g.c + ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la -ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la -ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la if REALLYSTATIC ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static -ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static -ntfs_3g_secaudit_LDFLAGS= $(AM_LDFLAGS) -all-static endif ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g -ntfs_3g_usermap_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g -ntfs_3g_secaudit_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g - ntfs_3g_probe_SOURCES = ntfs-3g.probe.c -ntfs_3g_usermap_SOURCES = usermap.c -ntfs_3g_secaudit_SOURCES= secaudit.c if RUN_LDCONFIG install-exec-hook: @@ -55,13 +52,15 @@ if ENABLE_MOUNT_HELPER install-exec-local: install-rootbinPROGRAMS $(MKDIR_P) "$(DESTDIR)/sbin" $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" + $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" endif install-data-local: install-man8 $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" + $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.lowntfs-3g.8" uninstall-local: $(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" if ENABLE_MOUNT_HELPER - $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" + $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" endif diff --git a/src/ntfs-3g.8.in b/src/ntfs-3g.8.in index 2cb28b03..3134d210 100644 --- a/src/ntfs-3g.8.in +++ b/src/ntfs-3g.8.in @@ -9,19 +9,30 @@ ntfs-3g \- Third Generation Read/Write NTFS Driver .SH SYNOPSIS .B ntfs-3g -.I volume mount_point \fB[-o \fIoption\fP\fB[,...]]\fR +.I volume mount_point .br .B mount \-t ntfs-3g -.I volume mount_point \fB[-o \fIoption\fP\fB[,...]]\fR +.I volume mount_point +.br +.B lowntfs-3g +\fB[-o \fIoption\fP\fB[,...]]\fR +.I volume mount_point +.br +.B mount \-t lowntfs-3g +\fB[-o \fIoption\fP\fB[,...]]\fR +.I volume mount_point .SH DESCRIPTION -\fBntfs-3g\fR is an NTFS driver, which can -create, remove, rename, move files, directories, hard links, and -streams; it can read and write files, including -streams and sparse files; it can handle special files like -symbolic links, devices, and FIFOs; moreover it can also read -and create transparently compressed files. +\fBntfs-3g\fR is an NTFS driver, which can create, remove, rename, move +files, directories, hard links, and streams; it can read and write files, +including streams, sparse files and transparently compressed files; it can +handle special files like symbolic links, devices, and FIFOs; moreover it +provides standard management of file ownership and permissions, including +POSIX ACLs. +.PP +It comes in two variants \fBntfs-3g\fR and \fBlowntfs-3g\fR with +a few differences mentioned below in relevant options descriptions. .PP The \fIvolume\fR to be mounted can be either a block device or an image file. @@ -67,8 +78,9 @@ data stream and can have many named data streams. The size of a file is the size of its unnamed data stream. By default, \fBntfs-3g\fR will only read the unnamed data stream. .PP -By using the options "streams_interface=windows", you will be able to read -any named data streams, simply by specifying the stream's name after a colon. +By using the options "streams_interface=windows", with the ntfs-3g driver +(not possible with lowntfs-3g), you will be able to read any named data +streams, simply by specifying the stream's name after a colon. For example: .RS .sp @@ -163,7 +175,7 @@ The .B relatime option is very similar to .B noatime. -It updates inode access times relative to modify or change time. +It updates inode access times relative to modify or change time. The access time is only updated if the previous access time was earlier than the current modify or change time. Unlike .B noatime @@ -197,8 +209,8 @@ when the user mapping file required by these operations is not defined. This option is on by default. .TP .B no_def_opts -By default ntfs-3g acts as "silent" was passed to it, -this option cancel this behaviour. +By default ntfs-3g acts as if "silent" were set, and +this option cancel this default behavior. .TP .BI streams_interface= value This option controls how the user can access Alternate Data Streams (ADS)