technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Renamed --libstatedir to --statedir.

Browse Source 
In BSD systems, it's usually </var/db> or some other dir under </var>
that is not </var/lib>, so $statedir is a more generic name.  See
hier(7).

Reported-by: Andrei Zeliankou <zelenkov@nginx.com>
Reported-by: Zhidao Hong <z.hong@f5.com>
Reviewed-by: Konstantin Pavlov <thresh@nginx.com>
Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Liam Crilly <liam@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
This commit is contained in:
Alejandro Colomar
2023-03-27 13:43:37 +02:00
parent e242b1454d
commit 5ba79b9b52
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auto/help
View File

@@ -21,14 +21,14 @@ cat << END
--datarootdir=DIR default: "\$prefix/share" --datarootdir=DIR default: "\$prefix/share"
--mandir=DIR default: "\$datarootdir/man" --mandir=DIR default: "\$datarootdir/man"
--localstatedir=DIR default: "\$prefix/var" --localstatedir=DIR default: "\$prefix/var"
--libstatedir=DIR default: "\$localstatedir/lib/unit" --statedir=DIR default: "\$localstatedir/lib/unit"
--runstatedir=DIR default: "\$localstatedir/run/unit" --runstatedir=DIR default: "\$localstatedir/run/unit"
--logdir=DIR default: "\$localstatedir/log/unit" --logdir=DIR default: "\$localstatedir/log/unit"
--tmpdir=DIR default: "/tmp" --tmpdir=DIR default: "/tmp"
--incdir=DIR [deprecated] synonym for --includedir --incdir=DIR [deprecated] synonym for --includedir
--modules=DIR [deprecated] synonym for --modulesdir --modules=DIR [deprecated] synonym for --modulesdir
--state=DIR [deprecated] synonym for --libstatedir --state=DIR [deprecated] synonym for --statedir
--tmp=DIR [deprecated] synonym for --tmpdir --tmp=DIR [deprecated] synonym for --tmpdir
--pid=FILE set pid filename, default: "\$runstatedir/unit.pid" --pid=FILE set pid filename, default: "\$runstatedir/unit.pid"

4
auto/make
View File

@@ -366,8 +366,8 @@ ${NXT_DAEMON}-install: $NXT_DAEMON install-check
test -d \$(DESTDIR)$NXT_SBINDIR \ test -d \$(DESTDIR)$NXT_SBINDIR \
|| install -d \$(DESTDIR)$NXT_SBINDIR || install -d \$(DESTDIR)$NXT_SBINDIR
install -p $NXT_BUILD_DIR/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/ install -p $NXT_BUILD_DIR/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/
test -d \$(DESTDIR)$NXT_LIBSTATEDIR \ test -d \$(DESTDIR)$NXT_STATEDIR \
|| install -d \$(DESTDIR)$NXT_LIBSTATEDIR || install -d \$(DESTDIR)$NXT_STATEDIR
test -d \$(DESTDIR)$NXT_LOGDIR \ test -d \$(DESTDIR)$NXT_LOGDIR \
|| install -d \$(DESTDIR)$NXT_LOGDIR || install -d \$(DESTDIR)$NXT_LOGDIR
test -d \$(DESTDIR)$NXT_RUNSTATEDIR \ test -d \$(DESTDIR)$NXT_RUNSTATEDIR \

8
auto/options
View File

@@ -74,10 +74,10 @@ do
--datarootdir=*) NXT_DATAROOTDIR="$value" ;; --datarootdir=*) NXT_DATAROOTDIR="$value" ;;
--mandir=*) NXT_MANDIR="$value" ;; --mandir=*) NXT_MANDIR="$value" ;;
--localstatedir=*) NXT_LOCALSTATEDIR="$value" ;; --localstatedir=*) NXT_LOCALSTATEDIR="$value" ;;
--libstatedir=*) NXT_LIBSTATEDIR="$value" ;; --statedir=*) NXT_STATEDIR="$value" ;;
--state=*) --state=*)
>&2 echo "[warn] option --state is deprecated; use --libstatedir" >&2 echo "[warn] option --state is deprecated; use --statedir"
NXT_LIBSTATEDIR="$value" NXT_STATEDIR="$value"
;; ;;
--logdir=*) NXT_LOGDIR="$value" ;; --logdir=*) NXT_LOGDIR="$value" ;;
--runstatedir=*) NXT_RUNSTATEDIR="$value" ;; --runstatedir=*) NXT_RUNSTATEDIR="$value" ;;
@@ -160,7 +160,7 @@ NXT_DATAROOTDIR="${NXT_DATAROOTDIR-"$NXT_PREFIX/share"}"
NXT_MANDIR="${NXT_MANDIR-"$NXT_DATAROOTDIR/man"}" NXT_MANDIR="${NXT_MANDIR-"$NXT_DATAROOTDIR/man"}"
NXT_LOCALSTATEDIR="${NXT_LOCALSTATEDIR-"$NXT_PREFIX/var"}" NXT_LOCALSTATEDIR="${NXT_LOCALSTATEDIR-"$NXT_PREFIX/var"}"
NXT_LIBSTATEDIR="${NXT_LIBSTATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}" NXT_STATEDIR="${NXT_STATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}"
NXT_LOGDIR="${NXT_LOGDIR-"$NXT_LOCALSTATEDIR/log/unit"}" NXT_LOGDIR="${NXT_LOGDIR-"$NXT_LOCALSTATEDIR/log/unit"}"
NXT_LOG="${NXT_LOG-"$NXT_LOGDIR/unit.log"}" NXT_LOG="${NXT_LOG-"$NXT_LOGDIR/unit.log"}"
NXT_RUNSTATEDIR="${NXT_RUNSTATEDIR-"$NXT_LOCALSTATEDIR/run/unit"}" NXT_RUNSTATEDIR="${NXT_RUNSTATEDIR-"$NXT_LOCALSTATEDIR/run/unit"}"

2
auto/summary
View File

@@ -13,7 +13,7 @@ Unit configuration summary:
include directory: ......... "$NXT_INCLUDEDIR" include directory: ......... "$NXT_INCLUDEDIR"
man pages directory: ....... "$NXT_MANDIR" man pages directory: ....... "$NXT_MANDIR"
modules directory: ......... "$NXT_MODULESDIR" modules directory: ......... "$NXT_MODULESDIR"
state directory: ........... "$NXT_LIBSTATEDIR" state directory: ........... "$NXT_STATEDIR"
tmp directory: ............. "$NXT_TMPDIR" tmp directory: ............. "$NXT_TMPDIR"
pid file: .................. "$NXT_PID" pid file: .................. "$NXT_PID"

2
configure vendored
View File

@@ -72,7 +72,7 @@ cat << END >> $NXT_AUTO_CONFIG_H
#define NXT_PID "$NXT_PID" #define NXT_PID "$NXT_PID"
#define NXT_LOG "$NXT_LOG" #define NXT_LOG "$NXT_LOG"
#define NXT_MODULESDIR "$NXT_MODULESDIR" #define NXT_MODULESDIR "$NXT_MODULESDIR"
#define NXT_LIBSTATEDIR "$NXT_LIBSTATEDIR" #define NXT_STATEDIR "$NXT_STATEDIR"
#define NXT_TMPDIR "$NXT_TMPDIR" #define NXT_TMPDIR "$NXT_TMPDIR"
#define NXT_CONTROL_SOCK "$NXT_CONTROL" #define NXT_CONTROL_SOCK "$NXT_CONTROL"

2
pkg/deb/Makefile
View File

@@ -117,7 +117,7 @@ endif
CONFIGURE_ARGS_COMMON=\ CONFIGURE_ARGS_COMMON=\
--prefix=/usr \ --prefix=/usr \
--libstatedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control="unix:/var/run/control.unit.sock" \ --control="unix:/var/run/control.unit.sock" \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \

2
pkg/docker/template.Dockerfile
View File

@@ -15,7 +15,7 @@ RUN set -ex \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \ && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \ && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS="--prefix=/usr \ && CONFIGURE_ARGS="--prefix=/usr \
--libstatedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \

2
pkg/rpm/Makefile
View File

@@ -108,7 +108,7 @@ endif
CONFIGURE_ARGS_COMMON=\ CONFIGURE_ARGS_COMMON=\
--prefix=/usr \ --prefix=/usr \
--libstatedir=%{_sharedstatedir}/unit \ --statedir=%{_sharedstatedir}/unit \
--control="unix:/var/run/unit/control.sock" \ --control="unix:/var/run/unit/control.sock" \
--pid=/var/run/unit/unit.pid \ --pid=/var/run/unit/unit.pid \
--log=/var/log/unit/unit.log \ --log=/var/log/unit/unit.log \

10
src/nxt_runtime.c
View File

@@ -786,7 +786,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
rt->pid = NXT_PID; rt->pid = NXT_PID;
rt->log = NXT_LOG; rt->log = NXT_LOG;
rt->modules = NXT_MODULESDIR; rt->modules = NXT_MODULESDIR;
rt->state = NXT_LIBSTATEDIR; rt->state = NXT_STATEDIR;
rt->control = NXT_CONTROL_SOCK; rt->control = NXT_CONTROL_SOCK;
rt->tmp = NXT_TMPDIR; rt->tmp = NXT_TMPDIR;
@@ -946,7 +946,7 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
static const char no_modules[] = static const char no_modules[] =
"option \"--modulesdir\" requires directory\n"; "option \"--modulesdir\" requires directory\n";
static const char no_state[] = static const char no_state[] =
"option \"--libstatedir\" requires directory\n"; "option \"--statedir\" requires directory\n";
static const char no_tmp[] = "option \"--tmpdir\" requires directory\n"; static const char no_tmp[] = "option \"--tmpdir\" requires directory\n";
static const char help[] = static const char help[] =
@@ -969,8 +969,8 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
" --modulesdir DIR set modules directory name\n" " --modulesdir DIR set modules directory name\n"
" default: \"" NXT_MODULESDIR "\"\n" " default: \"" NXT_MODULESDIR "\"\n"
"\n" "\n"
" --libstatedir DIR set state directory name\n" " --statedir DIR set state directory name\n"
" default: \"" NXT_LIBSTATEDIR "\"\n" " default: \"" NXT_STATEDIR "\"\n"
"\n" "\n"
" --tmpdir DIR set tmp directory name\n" " --tmpdir DIR set tmp directory name\n"
" default: \"" NXT_TMPDIR "\"\n" " default: \"" NXT_TMPDIR "\"\n"
@@ -1069,7 +1069,7 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
continue; continue;
} }
if (nxt_strcmp(p, "--libstatedir") == 0) { if (nxt_strcmp(p, "--statedir") == 0) {
if (*argv == NULL) { if (*argv == NULL) {
write(STDERR_FILENO, no_state, nxt_length(no_state)); write(STDERR_FILENO, no_state, nxt_length(no_state));
return NXT_ERROR; return NXT_ERROR;

2
test/conftest.py
View File

@@ -373,7 +373,7 @@ def unit_run(state_dir=None):
'--no-daemon', '--no-daemon',
'--modulesdir', '--modulesdir',
build_dir, build_dir,
'--libstatedir', '--statedir',
state, state,
'--pid', '--pid',
f'{temp_dir}/unit.pid', f'{temp_dir}/unit.pid',

6
tools/setup-unit
View File

@@ -598,14 +598,14 @@ unit_ctl_welcome()
# Check unitd is not configured already. # Check unitd is not configured already.
echo "$cmd" \ echo "$cmd" \
| if grep '\--libstatedir' >/dev/null; then | if grep '\--statedir' >/dev/null; then
echo "$cmd" \ echo "$cmd" \
| sed 's/ --/\n--/g' \ | sed 's/ --/\n--/g' \
| grep '\--libstatedir' \ | grep '\--statedir' \
| cut -d' ' -f2; | cut -d' ' -f2;
else else
$cmd --help \ $cmd --help \
| sed -n '/\--libstatedir/,+1p' \ | sed -n '/\--statedir/,+1p' \
| grep 'default:' \ | grep 'default:' \
| sed 's/ *default: "\(.*\)"/\1/'; | sed 's/ *default: "\(.*\)"/\1/';
fi \ fi \