forked from rpms/e2fsprogs
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 6499a3eef9583d893a442372e1567d74ce5a045b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lukas Czerner <lczerner@redhat.com>
|
||
|
|
Date: Sun, 15 Dec 2019 14:39:46 +0100
|
||
|
|
Subject: [PATCH] Revert "fuse2fs: install fuse2fs in /usr/bin instead of
|
||
|
|
/usr/sbin"
|
||
|
|
|
||
|
|
This reverts commit b71150355dca5409cf8e82a7e715e459a795bbf8.
|
||
|
|
---
|
||
|
|
debian/fuse2fs.install | 2 +-
|
||
|
|
misc/Makefile.in | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/debian/fuse2fs.install b/debian/fuse2fs.install
|
||
|
|
index 2ed4c3c0..cd37a70e 100644
|
||
|
|
--- a/debian/fuse2fs.install
|
||
|
|
+++ b/debian/fuse2fs.install
|
||
|
|
@@ -1,2 +1,2 @@
|
||
|
|
-/usr/bin/fuse2fs
|
||
|
|
+/usr/sbin/fuse2fs
|
||
|
|
/usr/share/man/man1/fuse2fs.1
|
||
|
|
diff --git a/misc/Makefile.in b/misc/Makefile.in
|
||
|
|
index f2554446..22c98489 100644
|
||
|
|
--- a/misc/Makefile.in
|
||
|
|
+++ b/misc/Makefile.in
|
||
|
|
@@ -35,7 +35,7 @@ INSTALL = @INSTALL@
|
||
|
|
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
|
||
|
|
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
|
||
|
|
USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \
|
||
|
|
- $(E4DEFRAG_PROG) $(E4CRYPT_PROG)
|
||
|
|
+ $(E4DEFRAG_PROG) $(E4CRYPT_PROG) $(FUSE_PROG)
|
||
|
|
SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
|
||
|
|
e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
|
||
|
|
logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \
|
||
|
|
@@ -43,7 +43,7 @@ SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
|
||
|
|
e2mmpstatus.8
|
||
|
|
FMANPAGES= mke2fs.conf.5 ext4.5
|
||
|
|
|
||
|
|
-UPROGS= chattr lsattr $(FUSE_PROG) @UUID_CMT@ uuidgen
|
||
|
|
+UPROGS= chattr lsattr @UUID_CMT@ uuidgen
|
||
|
|
UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
|
||
|
|
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
|
||
|
|
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|