diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:34:44 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:34:44 +0200 |
| commit | d2183f09d77e298a9119cb523b9be801ecc08865 (patch) | |
| tree | 00276848110789dbfe807a11ba0bf5e581b0cc0b /lib | |
| parent | a4c340d99914b0d99b327339ad15b2e9684b5023 (diff) | |
add 01-adjust_config_basedir.diff as quilt patch, unapply from source tree
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common/BoxPortsAndFiles.h.in | 6 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileController.h | 2 | ||||
| -rwxr-xr-x | lib/raidfile/raidfile-config.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/common/BoxPortsAndFiles.h.in b/lib/common/BoxPortsAndFiles.h.in index fd34a3bb..fcc0ddce 100644 --- a/lib/common/BoxPortsAndFiles.h.in +++ b/lib/common/BoxPortsAndFiles.h.in @@ -31,9 +31,9 @@ #define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \ GetDefaultConfigFilePath("bbstored.conf").c_str() #else -#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbackupd.conf" -#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/raidfile.conf" -#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbstored.conf" +#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf" +#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/box/raidfile.conf" +#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbstored.conf" #endif #endif // BOXPORTSANDFILES__H diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h index 216bdf3a..783cb055 100644 --- a/lib/raidfile/RaidFileController.h +++ b/lib/raidfile/RaidFileController.h @@ -82,7 +82,7 @@ public: public: void Initialise(const std::string& rConfigFilename = - "/etc/boxbackup/raidfile.conf"); + "/etc/box/raidfile.conf"); int GetNumDiscSets() {return mSetList.size();} // -------------------------------------------------------------------------- diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in index b8ea73a5..76b65ace 100755 --- a/lib/raidfile/raidfile-config.in +++ b/lib/raidfile/raidfile-config.in @@ -19,7 +19,7 @@ Usage: raidfile-config config-dir block-size dir0 [dir1 dir2] Parameters: - config-dir is usually @sysconfdir_expanded@/boxbackup + config-dir is usually @sysconfdir_expanded@/box block-size must be a power of two, and usually the block or fragment size of your file system dir0, dir1, dir2 are the directories used as the root of the raid |