Package: lizardfs / 3.12.0+dfsg-3

debian-paths.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
Last-Update: 2015-10-29
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: debianise paths, consistent with package name.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,10 +15,10 @@
     "${CMAKE_CURRENT_LIST_FILE} and try again."
   )
 endif()
 
-set(DEFAULT_USER  "mfs" CACHE STRING "Default user to run daemons as")
-set(DEFAULT_GROUP "mfs" CACHE STRING "Default group to run daemons as")
+set(DEFAULT_USER  "lizardfs" CACHE STRING "Default user to run daemons as")
+set(DEFAULT_GROUP "lizardfs" CACHE STRING "Default group to run daemons as")
 set(LIZARDFS_BLOCKS_IN_CHUNK 1024 CACHE INT "Number of blocks in one chunk")
 set(LIZARDFS_BLOCK_SIZE 65536 CACHE INT "Number of bytes in one block")
 option(ENABLE_WERROR        "Enable treating compilation warnings as errors"          OFF)
 option(ENABLE_LIGHTMFS      "Enable light version of LizardFS"                        OFF)
@@ -181,11 +181,11 @@
   endif()
   set(BIN_SUBDIR   "usr/bin")
   set(SBIN_SUBDIR  "usr/sbin")
   set(LIB_SUBDIR   "usr/lib${LIBSUFFIX}")
-  set(ETC_SUBDIR   "etc/mfs")
-  set(RUN_SUBDIR   "var/run/mfs")
-  set(DATA_SUBDIR  "var/lib/mfs")
+  set(ETC_SUBDIR   "etc/lizardfs")
+  set(RUN_SUBDIR   "var/run/lizardfs")
+  set(DATA_SUBDIR  "var/lib/lizardfs")
   set(MAN_SUBDIR   "usr/share/man")
   set(CGI_SUBDIR   "usr/share/mfscgi")
   set(INCL_SUBDIR  "usr/include/lizardfs")
 else()
--- a/src/data/mfsmount.cfg
+++ b/src/data/mfsmount.cfg
@@ -12,5 +12,5 @@
 # with a "/" and be a fully qualified path.
 #
 # Example:
 #
-# /mnt/mfs
+# /mnt/lizardfs
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -890,10 +890,10 @@
 	}
 
 	if (cfg_load(cfgfile.c_str(), logundefined)==0) {
 		lzfs_pretty_syslog(LOG_WARNING, "configuration file %s not found - using defaults; "
-				"please create one to remove this warning "
-				"(you can copy %s.dist to get a base configuration)",
+				"please create %s to remove this warning "
+				"(to get a base configuration you can copy corresponding file from /usr/share/doc/lizardfs-master/examples)",
 				cfgfile.c_str(), default_cfgfile.c_str());
 	} else if (runmode==RunMode::kStart || runmode==RunMode::kRestart) {
 		lzfs_pretty_syslog(LOG_INFO, "configuration file %s loaded", cfgfile.c_str());
 	}
--- a/src/master/exports.cc
+++ b/src/master/exports.cc
@@ -953,9 +953,9 @@
 	if (fd==NULL) {
 		if (errno==ENOENT) {
 			throw InitializeException(
 					std::string("exports configuration file (") + ExportsFileName + ") not found"
-					" - please create one (you can copy " ETC_PATH "/mfsexports.cfg.dist"
+					" - please create one (you can copy /usr/share/doc/lizardfs-master/examples/mfsexports.cfg"
 					" to get a base configuration)");
 		} else {
 			throw InitializeException(
 					std::string("can't open exports configuration file (") + ExportsFileName + "):"
--- a/tests/tools/lizardfs.sh
+++ b/tests/tools/lizardfs.sh
@@ -13,10 +13,10 @@
 	local disks_per_chunkserver=${DISK_PER_CHUNKSERVER:-1}
 	local auto_shadow_master=${AUTO_SHADOW_MASTER:-YES}
 	local cgi_server=${CGI_SERVER:-NO}
 	local ip_address=$(get_ip_addr)
-	local etcdir=$TEMP_DIR/mfs/etc
-	local vardir=$TEMP_DIR/mfs/var
+	local etcdir=$TEMP_DIR/lizardfs/etc
+	local vardir=$TEMP_DIR/lizardfs/var
 	local mntdir=$TEMP_DIR/mnt
 	local master_start_param=${MASTER_START_PARAM:-}
 	local shadow_start_param=${SHADOW_START_PARAM:-}
 	declare -gA lizardfs_info_
--- a/doc/mfsrestoremaster.8.txt
+++ b/doc/mfsrestoremaster.8.txt
@@ -10,9 +10,9 @@
 [verse]
 *mfsrestoremaster* '<net-interface>' '[<etc-mfs-dir>]'
 
 *<net-interface>* - network interface to reconfigure.
-*<etc-mfs-dir>* - mfs configuration directory to use (default: /etc/mfs).
+*<etc-mfs-dir>* - mfs configuration directory to use (default: /etc/lizardfs).
 
 == DESCRIPTION
 
 *mfsmetadump*