summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgroup-util.h3
-rw-r--r--src/cryptsetup.c3
-rw-r--r--src/dbus-common.c7
-rw-r--r--src/def.h35
-rw-r--r--src/device.c1
-rw-r--r--src/execute.c1
-rw-r--r--src/execute.h4
-rw-r--r--src/main.c1
-rw-r--r--src/mount.c1
-rw-r--r--src/service.c7
-rw-r--r--src/socket.c1
-rw-r--r--src/swap.c1
-rw-r--r--src/unit.h3
13 files changed, 50 insertions, 18 deletions
diff --git a/src/cgroup-util.h b/src/cgroup-util.h
index 1eccbc9fd7..d142af34bc 100644
--- a/src/cgroup-util.h
+++ b/src/cgroup-util.h
@@ -27,8 +27,7 @@
#include <dirent.h>
#include "set.h"
-
-#define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
+#include "def.h"
int cg_enumerate_processes(const char *controller, const char *path, FILE **_f);
int cg_enumerate_tasks(const char *controller, const char *path, FILE **_f);
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 989734be1b..3aa822a1d0 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -31,6 +31,7 @@
#include "util.h"
#include "strv.h"
#include "ask-password-api.h"
+#include "def.h"
static const char *opt_type = NULL; /* LUKS1 or PLAIN */
static char *opt_cipher = NULL;
@@ -308,7 +309,7 @@ int main(int argc, char *argv[]) {
if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY;
- until = now(CLOCK_MONOTONIC) + (opt_timeout > 0 ? opt_timeout : 60 * USEC_PER_SEC);
+ until = now(CLOCK_MONOTONIC) + (opt_timeout > 0 ? opt_timeout : DEFAULT_TIMEOUT_USEC);
opt_tries = opt_tries > 0 ? opt_tries : 3;
opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);
diff --git a/src/dbus-common.c b/src/dbus-common.c
index bb9cf2e2ab..e352b8cf99 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -30,6 +30,7 @@
#include "log.h"
#include "dbus-common.h"
#include "util.h"
+#include "def.h"
int bus_check_peercred(DBusConnection *c) {
int fd;
@@ -57,8 +58,6 @@ int bus_check_peercred(DBusConnection *c) {
return 1;
}
-#define TIMEOUT_USEC (60*USEC_PER_SEC)
-
static int sync_auth(DBusConnection *bus, DBusError *error) {
usec_t begin, tstamp;
@@ -71,13 +70,13 @@ static int sync_auth(DBusConnection *bus, DBusError *error) {
begin = tstamp = now(CLOCK_MONOTONIC);
for (;;) {
- if (tstamp > begin + TIMEOUT_USEC)
+ if (tstamp > begin + DEFAULT_TIMEOUT_USEC)
break;
if (dbus_connection_get_is_authenticated(bus))
break;
- if (!dbus_connection_read_write_dispatch(bus, ((begin + TIMEOUT_USEC - tstamp) + USEC_PER_MSEC - 1) / USEC_PER_MSEC))
+ if (!dbus_connection_read_write_dispatch(bus, ((begin + DEFAULT_TIMEOUT_USEC - tstamp) + USEC_PER_MSEC - 1) / USEC_PER_MSEC))
break;
tstamp = now(CLOCK_MONOTONIC);
diff --git a/src/def.h b/src/def.h
new file mode 100644
index 0000000000..c23cd33d8a
--- /dev/null
+++ b/src/def.h
@@ -0,0 +1,35 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foodefhfoo
+#define foodefhfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "util.h"
+
+#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
+#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
+
+#define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
+
+#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
+#define SIGNALS_IGNORE SIGKILL,SIGPIPE
+
+#endif
diff --git a/src/device.c b/src/device.c
index ccf2935a91..41c96cef03 100644
--- a/src/device.c
+++ b/src/device.c
@@ -29,6 +29,7 @@
#include "log.h"
#include "unit-name.h"
#include "dbus-device.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
[DEVICE_DEAD] = UNIT_INACTIVE,
diff --git a/src/execute.c b/src/execute.c
index 556ff9bda9..c1edf61fb1 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -55,6 +55,7 @@
#include "exit-status.h"
#include "missing.h"
#include "utmp-wtmp.h"
+#include "def.h"
/* This assumes there is a 'tty' group */
#define TTY_MODE 0620
diff --git a/src/execute.h b/src/execute.h
index e77cdcf0bb..755dea35af 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -42,10 +42,6 @@ struct CGroupBonding;
/* Abstract namespace! */
#define LOGGER_SOCKET "/dev/.run/systemd/logger"
-/* This doesn't really belong here, but I couldn't find a better place to put this. */
-#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
-#define SIGNALS_IGNORE SIGKILL,SIGPIPE
-
typedef enum KillMode {
KILL_CONTROL_GROUP = 0,
KILL_PROCESS_GROUP,
diff --git a/src/main.c b/src/main.c
index 5154b575ff..7edd6b5811 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,6 +51,7 @@
#include "label.h"
#include "build.h"
#include "strv.h"
+#include "def.h"
static enum {
ACTION_RUN,
diff --git a/src/mount.c b/src/mount.c
index 00780101a0..39525b6650 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -37,6 +37,7 @@
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE,
diff --git a/src/service.c b/src/service.c
index e7a9e7c586..0f28312b38 100644
--- a/src/service.c
+++ b/src/service.c
@@ -35,13 +35,12 @@
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
-
-#define COMMENTS "#;\n"
-#define NEWLINES "\n\r"
+#include "def.h"
+#include "util.h"
#ifdef HAVE_SYSV_COMPAT
-#define DEFAULT_SYSV_TIMEOUT_USEC (3*USEC_PER_MINUTE)
+#define DEFAULT_SYSV_TIMEOUT_USEC (5*USEC_PER_MINUTE)
typedef enum RunlevelType {
RUNLEVEL_UP,
diff --git a/src/socket.c b/src/socket.c
index 130f51c078..9045a2fc85 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -42,6 +42,7 @@
#include "bus-errors.h"
#include "label.h"
#include "exit-status.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
diff --git a/src/swap.c b/src/swap.c
index f59b0fb18d..035efbaf4b 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -37,6 +37,7 @@
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
diff --git a/src/unit.h b/src/unit.h
index 9b7eb5e854..4245f3cf1c 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -40,9 +40,6 @@ typedef enum UnitDependency UnitDependency;
#include "execute.h"
#include "condition.h"
-#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
-#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
-
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-10 07:06:37 +0000