diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-08-13 22:40:15 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-13 22:40:15 -0400 |
| commit | 2ca70c22536012b8a601b1d38d954420a8db8608 (patch) | |
| tree | 495c9f835d2a4754b6298f8b20d7dc7810020fbe /misc | |
| parent | 4cf064e051a5668e2e505c37d173141055e270ba (diff) | |
| parent | faae7aa00df0abe7c6151fc4947aa6501b981ee1 (diff) | |
| download | e2fsprogs-2ca70c22536012b8a601b1d38d954420a8db8608.tar.gz | |
Merge branch 'maint' into next
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.in | 4 | ||||
| -rw-r--r-- | misc/mke2fs.c | 3 | ||||
| -rw-r--r-- | misc/tune2fs.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/misc/Makefile.in b/misc/Makefile.in index 99028413..22c98489 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -529,8 +529,8 @@ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 installdirs: - $(E) " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ + $(E) " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" + $(Q) $(MKDIR_P) $(DESTDIR)$(sbindir) \ $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ diff --git a/misc/mke2fs.c b/misc/mke2fs.c index b23ea766..f05003fc 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1124,7 +1124,8 @@ static __u32 ok_features[3] = { EXT4_FEATURE_RO_COMPAT_BIGALLOC| EXT4_FEATURE_RO_COMPAT_QUOTA| EXT4_FEATURE_RO_COMPAT_METADATA_CSUM| - EXT4_FEATURE_RO_COMPAT_PROJECT + EXT4_FEATURE_RO_COMPAT_PROJECT| + EXT4_FEATURE_RO_COMPAT_VERITY }; diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 4b673bc2..0f095f4d 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -170,7 +170,8 @@ static __u32 ok_features[3] = { EXT4_FEATURE_RO_COMPAT_QUOTA | EXT4_FEATURE_RO_COMPAT_METADATA_CSUM | EXT4_FEATURE_RO_COMPAT_READONLY | - EXT4_FEATURE_RO_COMPAT_PROJECT + EXT4_FEATURE_RO_COMPAT_PROJECT | + EXT4_FEATURE_RO_COMPAT_VERITY }; static __u32 clear_ok_features[3] = { |