diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | include/pathnames.h | 2 | ||||
| -rw-r--r-- | libuuid/src/uuidd.h | 2 | ||||
| -rw-r--r-- | misc-utils/test_uuidd.c | 4 | ||||
| -rw-r--r-- | misc-utils/uuidd.8.in | 4 | ||||
| -rw-r--r-- | misc-utils/uuidd.rc.in | 2 | ||||
| -rw-r--r-- | misc-utils/uuidd.socket.in | 2 |
8 files changed, 21 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 54c85e16f..e7657afe9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -include config.h \ -I$(top_srcdir)/include \ -DLOCALEDIR=\"$(localedir)\" \ - -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" + -D_PATH_RUNSTATEDIR=\"${runstatedir}\" AM_CFLAGS = -fsigned-char $(WARN_CFLAGS) AM_LDFLAGS = @@ -119,7 +119,7 @@ edit_cmd = sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \ -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \ -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \ diff --git a/configure.ac b/configure.ac index dc71faa00..b204ec11e 100644 --- a/configure.ac +++ b/configure.ac @@ -72,13 +72,17 @@ AS_CASE([$exec_prefix:$prefix], ] ) -AS_CASE([$prefix:$localstatedir], - [NONE:'${prefix}/var' | /usr:'${prefix}/var'], - [localstatedir=/run - AC_MSG_NOTICE([ --localstatedir defaults to /run]) - ] + +# default for old versions without $runstatedir +AS_IF([test x"$runstatedir" = x], [runstatedir='${localstatedir}/run']) + +# our default if $localstatedir unchanged +AS_CASE([$localstatedir:$runstatedir], + [NONE:'${localstatedir}/run' | /var:'${localstatedir}/run' | NONE:'/run' ], + [runstatedir=/run; AC_MSG_NOTICE([ --runstatedir defaults to /run])] ) -AC_SUBST([localstatedir]) + +AC_SUBST([runstatedir]) # The original default values of {bin,sbin,lib}dir @@ -2282,7 +2286,7 @@ AC_MSG_RESULT([ prefix: ${prefix} exec prefix: ${exec_prefix} - localstatedir: ${localstatedir} + runstatedir: ${runstatedir} bindir: ${bindir} sbindir: ${sbindir} libdir: ${libdir} diff --git a/include/pathnames.h b/include/pathnames.h index 8af386457..747382dae 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -71,7 +71,7 @@ #define _PATH_ISSUE "/etc/issue" #define _PATH_OS_RELEASE_ETC "/etc/os-release" #define _PATH_OS_RELEASE_USR "/usr/lib/os-release" -#define _PATH_NUMLOCK_ON _PATH_LOCALSTATEDIR "/numlock-on" +#define _PATH_NUMLOCK_ON _PATH_RUNSTATEDIR "/numlock-on" #define _PATH_LOGINDEFS "/etc/login.defs" /* misc paths */ diff --git a/libuuid/src/uuidd.h b/libuuid/src/uuidd.h index 2f709680b..e55c86f2f 100644 --- a/libuuid/src/uuidd.h +++ b/libuuid/src/uuidd.h @@ -35,7 +35,7 @@ #ifndef _UUID_UUIDD_H #define _UUID_UUIDD_H -#define UUIDD_DIR _PATH_LOCALSTATEDIR "/uuidd" +#define UUIDD_DIR _PATH_RUNSTATEDIR "/uuidd" #define UUIDD_SOCKET_PATH UUIDD_DIR "/request" #define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid" #define UUIDD_PATH "/usr/sbin/uuidd" diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c index 7bbd3a948..de5ae3ab2 100644 --- a/misc-utils/test_uuidd.c +++ b/misc-utils/test_uuidd.c @@ -18,10 +18,10 @@ * * uuidd --debug --no-fork --no-pid --socket /run/uuidd/request * - * if the $localstatedir (as defined by build-system) is /run. If you want + * if the $runstatedir (as defined by build-system) is /run. If you want * to overwrite the built-in default then use: * - * make uuidd uuidgen localstatedir=/var + * make uuidd uuidgen runstatedir=/var/run */ #include <pthread.h> #include <stdio.h> diff --git a/misc-utils/uuidd.8.in b/misc-utils/uuidd.8.in index e25582564..0a5cf471b 100644 --- a/misc-utils/uuidd.8.in +++ b/misc-utils/uuidd.8.in @@ -37,7 +37,7 @@ Do not create a pid file. .TP .BR \-p , " \-\-pid " \fIpath\fR Specify the pathname where the pid file should be written. By default, -the pid file is written to @localstatedir@/uuidd/uuidd.pid. +the pid file is written to @runstatedir@/uuidd/uuidd.pid. .TP .BR \-q , " \-\-quiet " Suppress some failure messages. @@ -54,7 +54,7 @@ a configure option. .TP .BR \-s , " \-\-socket " \fIpath\fR Make uuidd use this pathname for the unix-domain socket. By default, the -pathname used is @localstatedir@/uuidd/request. This option is primarily +pathname used is @runstatedir@/uuidd/request. This option is primarily for debugging purposes, since the pathname is hard-coded in the libuuid library. .TP diff --git a/misc-utils/uuidd.rc.in b/misc-utils/uuidd.rc.in index 26273e5c5..794394562 100644 --- a/misc-utils/uuidd.rc.in +++ b/misc-utils/uuidd.rc.in @@ -17,7 +17,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/uuidd UUIDD_USER=uuidd UUIDD_GROUP=uuidd -UUIDD_DIR=@localstatedir@/uuidd +UUIDD_DIR=@runstatedir@/uuidd PIDFILE=$UUIDD_DIR/uuidd.pid test -x $DAEMON || exit 0 diff --git a/misc-utils/uuidd.socket.in b/misc-utils/uuidd.socket.in index d8be72fd6..8ddcac26f 100644 --- a/misc-utils/uuidd.socket.in +++ b/misc-utils/uuidd.socket.in @@ -2,7 +2,7 @@ Description=UUID daemon activation socket [Socket] -ListenStream=@localstatedir@/uuidd/request +ListenStream=@runstatedir@/uuidd/request [Install] WantedBy=sockets.target |