mirror of
https://git.proxmox.com/git/mirror_corosync
synced 2025-08-02 23:25:37 +00:00
Make /etc/corosync/corosync.conf default configuration file
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2235 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
parent
8b9812de8f
commit
c54e74e3f6
@ -24,7 +24,7 @@ if test "$prefix" = "NONE"; then
|
||||
fi
|
||||
dnl Fix "sysconfdir" variable if not specified
|
||||
if test "$sysconfdir" = "\${prefix}/etc"; then
|
||||
sysconfdir="/etc"
|
||||
sysconfdir="/etc/corosync"
|
||||
fi
|
||||
dnl Fix "libdir" variable if not specified
|
||||
if test "$libdir" = "\${exec_prefix}/lib"; then
|
||||
|
@ -219,7 +219,7 @@ static int read_uidgid_files_into_objdb(
|
||||
int res = 0;
|
||||
struct stat stat_buf;
|
||||
|
||||
dirname = SYSCONFDIR "/corosync/uidgid.d";
|
||||
dirname = SYSCONFDIR "/uidgid.d";
|
||||
dp = opendir (dirname);
|
||||
|
||||
if (dp == NULL)
|
||||
|
@ -764,7 +764,7 @@ int totem_config_keyread (
|
||||
if (!got_key) {
|
||||
const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
|
||||
if (!filename)
|
||||
filename = SYSCONFDIR "/ais/authkey";
|
||||
filename = SYSCONFDIR "/authkey";
|
||||
res = read_keyfile(filename, totem_config, error_string);
|
||||
if (res)
|
||||
goto key_error;
|
||||
|
@ -44,7 +44,7 @@
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#define KEYFILE SYSCONFDIR "/ais/authkey"
|
||||
#define KEYFILE SYSCONFDIR "/authkey"
|
||||
|
||||
int main (void) {
|
||||
int authkey_fd;
|
||||
@ -57,7 +57,7 @@ int main (void) {
|
||||
printf ("Error: Authorization key must be generated as root user.\n");
|
||||
exit (1);
|
||||
}
|
||||
if (mkdir (SYSCONFDIR "/ais", 0700)) {
|
||||
if (mkdir (SYSCONFDIR, 0700)) {
|
||||
if (errno != EEXIST) {
|
||||
perror ("Failed to create directory: " SYSCONFDIR "/ais");
|
||||
exit (1);
|
||||
|
Loading…
Reference in New Issue
Block a user