|
 |
771b4bc |
From a23fd8d0c30fe16f8d59adc8a99eeb89daeedef1 Mon Sep 17 00:00:00 2001
|
|
|
771b4bc |
From: Kay Sievers <kay@vrfy.org>
|
|
|
771b4bc |
Date: Tue, 10 Apr 2012 18:46:51 +0200
|
|
|
771b4bc |
Subject: [PATCH] move cgroup-util.[ch] to shared/ (cherry picked from commit
|
|
|
771b4bc |
77d47be64f8b0497c44a4288f2531fc1056624ae)
|
|
|
771b4bc |
|
|
|
771b4bc |
---
|
|
|
771b4bc |
Makefile.am | 28 +++++++++-------------------
|
|
|
771b4bc |
src/{ => shared}/cgroup-util.c | 0
|
|
|
771b4bc |
src/{ => shared}/cgroup-util.h | 0
|
|
|
771b4bc |
3 files changed, 9 insertions(+), 19 deletions(-)
|
|
|
771b4bc |
rename src/{ => shared}/cgroup-util.c (100%)
|
|
|
771b4bc |
rename src/{ => shared}/cgroup-util.h (100%)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/Makefile.am b/Makefile.am
|
|
|
771b4bc |
index bb86f8a..5423d05 100644
|
|
|
771b4bc |
--- a/Makefile.am
|
|
|
771b4bc |
+++ b/Makefile.am
|
|
|
771b4bc |
@@ -220,7 +220,7 @@ noinst_PROGRAMS = \
|
|
|
771b4bc |
test-env-replace \
|
|
|
771b4bc |
test-strv \
|
|
|
771b4bc |
test-install \
|
|
|
771b4bc |
- test-watchdog
|
|
|
771b4bc |
+ test-watchdog
|
|
|
771b4bc |
|
|
|
771b4bc |
dist_pkgsysconf_DATA = \
|
|
|
771b4bc |
src/system.conf \
|
|
|
771b4bc |
@@ -563,7 +563,9 @@ libsystemd_basic_la_SOURCES = \
|
|
|
771b4bc |
src/shared/exit-status.c \
|
|
|
771b4bc |
src/shared/exit-status.h \
|
|
|
771b4bc |
src/shared/utf8.c \
|
|
|
771b4bc |
- src/shared/utf8.h
|
|
|
771b4bc |
+ src/shared/utf8.h \
|
|
|
771b4bc |
+ src/shared/cgroup-util.c \
|
|
|
771b4bc |
+ src/shared/cgroup-util.h
|
|
|
771b4bc |
|
|
|
771b4bc |
libsystemd_basic_la_CFLAGS = \
|
|
|
771b4bc |
$(AM_CFLAGS) \
|
|
|
771b4bc |
@@ -705,8 +707,6 @@ libsystemd_core_la_SOURCES = \
|
|
|
771b4bc |
src/machine-id-setup.h \
|
|
|
771b4bc |
src/fdset.c \
|
|
|
771b4bc |
src/fdset.h \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
- src/cgroup-util.h \
|
|
|
771b4bc |
src/condition.c \
|
|
|
771b4bc |
src/condition.h \
|
|
|
771b4bc |
src/dbus-common.c \
|
|
|
771b4bc |
@@ -838,8 +838,7 @@ test_daemon_LDADD = \
|
|
|
771b4bc |
libsystemd-daemon.la
|
|
|
771b4bc |
|
|
|
771b4bc |
test_cgroup_SOURCES = \
|
|
|
771b4bc |
- src/test-cgroup.c \
|
|
|
771b4bc |
- src/cgroup-util.c
|
|
|
771b4bc |
+ src/test-cgroup.c
|
|
|
771b4bc |
|
|
|
771b4bc |
test_cgroup_LDADD = \
|
|
|
771b4bc |
libsystemd-basic.la
|
|
|
771b4bc |
@@ -1051,7 +1050,6 @@ systemctl_SOURCES = \
|
|
|
771b4bc |
src/dbus-common.c \
|
|
|
771b4bc |
src/path-lookup.c \
|
|
|
771b4bc |
src/cgroup-show.c \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
src/unit-name.c \
|
|
|
771b4bc |
src/pager.c \
|
|
|
771b4bc |
src/install.c \
|
|
|
771b4bc |
@@ -1097,7 +1095,6 @@ systemd_reply_password_LDADD = \
|
|
|
771b4bc |
systemd_cgls_SOURCES = \
|
|
|
771b4bc |
src/cgls.c \
|
|
|
771b4bc |
src/cgroup-show.c \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
src/pager.c
|
|
|
771b4bc |
|
|
|
771b4bc |
systemd_cgls_LDADD = \
|
|
|
771b4bc |
@@ -1105,8 +1102,7 @@ systemd_cgls_LDADD = \
|
|
|
771b4bc |
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
systemd_cgtop_SOURCES = \
|
|
|
771b4bc |
- src/cgtop.c \
|
|
|
771b4bc |
- src/cgroup-util.c
|
|
|
771b4bc |
+ src/cgtop.c
|
|
|
771b4bc |
|
|
|
771b4bc |
systemd_cgtop_LDADD = \
|
|
|
771b4bc |
libsystemd-basic.la
|
|
|
771b4bc |
@@ -1114,7 +1110,6 @@ systemd_cgtop_LDADD = \
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
systemd_nspawn_SOURCES = \
|
|
|
771b4bc |
src/nspawn.c \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
src/loopback-setup.c
|
|
|
771b4bc |
|
|
|
771b4bc |
systemd_nspawn_LDADD = \
|
|
|
771b4bc |
@@ -1316,8 +1311,7 @@ systemd_journald_SOURCES = \
|
|
|
771b4bc |
src/journal/lookup3.c \
|
|
|
771b4bc |
src/journal/journal-rate-limit.c \
|
|
|
771b4bc |
src/journal/sparse-endian.h \
|
|
|
771b4bc |
- src/sd-id128.c \
|
|
|
771b4bc |
- src/cgroup-util.c
|
|
|
771b4bc |
+ src/sd-id128.c
|
|
|
771b4bc |
|
|
|
771b4bc |
nodist_systemd_journald_SOURCES = \
|
|
|
771b4bc |
src/journal/journald-gperf.c
|
|
|
771b4bc |
@@ -1933,7 +1927,6 @@ systemd_logind_SOURCES = \
|
|
|
771b4bc |
src/login/logind-user-dbus.c \
|
|
|
771b4bc |
src/dbus-common.c \
|
|
|
771b4bc |
src/dbus-loop.c \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
src/polkit.c
|
|
|
771b4bc |
|
|
|
771b4bc |
nodist_systemd_logind_SOURCES = \
|
|
|
771b4bc |
@@ -1960,8 +1953,7 @@ systemd_logind_LDADD += \
|
|
|
771b4bc |
endif
|
|
|
771b4bc |
|
|
|
771b4bc |
systemd_user_sessions_SOURCES = \
|
|
|
771b4bc |
- src/login/user-sessions.c \
|
|
|
771b4bc |
- src/cgroup-util.c
|
|
|
771b4bc |
+ src/login/user-sessions.c
|
|
|
771b4bc |
|
|
|
771b4bc |
systemd_user_sessions_LDADD = \
|
|
|
771b4bc |
libsystemd-basic.la
|
|
|
771b4bc |
@@ -1975,7 +1967,6 @@ loginctl_SOURCES = \
|
|
|
771b4bc |
src/login/sysfs-show.c \
|
|
|
771b4bc |
src/dbus-common.c \
|
|
|
771b4bc |
src/cgroup-show.c \
|
|
|
771b4bc |
- src/cgroup-util.c \
|
|
|
771b4bc |
src/pager.c
|
|
|
771b4bc |
|
|
|
771b4bc |
loginctl_CFLAGS = \
|
|
|
771b4bc |
@@ -2002,8 +1993,7 @@ noinst_PROGRAMS += \
|
|
|
771b4bc |
test-login
|
|
|
771b4bc |
|
|
|
771b4bc |
libsystemd_login_la_SOURCES = \
|
|
|
771b4bc |
- src/login/sd-login.c \
|
|
|
771b4bc |
- src/cgroup-util.c
|
|
|
771b4bc |
+ src/login/sd-login.c
|
|
|
771b4bc |
|
|
|
771b4bc |
libsystemd_login_la_CFLAGS = \
|
|
|
771b4bc |
$(AM_CFLAGS) \
|
|
|
771b4bc |
diff --git a/src/cgroup-util.c b/src/shared/cgroup-util.c
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/cgroup-util.c
|
|
|
771b4bc |
rename to src/shared/cgroup-util.c
|
|
|
771b4bc |
diff --git a/src/cgroup-util.h b/src/shared/cgroup-util.h
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/cgroup-util.h
|
|
|
771b4bc |
rename to src/shared/cgroup-util.h
|