chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d22c438
)
Prep v231.2: Apply some minor style fixes
author
Sven Eden
<yamakuzure@gmx.net>
Mon, 19 Jun 2017 08:17:56 +0000
(10:17 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Mon, 19 Jun 2017 08:17:56 +0000
(10:17 +0200)
Makefile.am
patch
|
blob
|
history
man/elogind.xml
patch
|
blob
|
history
man/loginctl.xml
patch
|
blob
|
history
src/basic/missing.h
patch
|
blob
|
history
src/core/cgroup.h
patch
|
blob
|
history
src/login/loginctl.c
patch
|
blob
|
history
src/login/logind-action.c
patch
|
blob
|
history
src/login/logind.c
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index bd4230c0d1845a5f9d71a4cb30c2b21c4b893b31..d6e1bd856f260fdbfa4831c205d6b03c18031c89 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-39,7
+39,7
@@
SUBDIRS = . po
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBELOGIND_CURRENT=16
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBELOGIND_CURRENT=16
-LIBELOGIND_REVISION=
0
+LIBELOGIND_REVISION=
2
LIBELOGIND_AGE=16
# Dirs of external packages
LIBELOGIND_AGE=16
# Dirs of external packages
diff --git
a/man/elogind.xml
b/man/elogind.xml
index 08a37cd54adef3ea23e017ed663a90328fc61953..140249fc2241ea7e7fcc2a4dbc336c41425309ca 100644
(file)
--- a/
man/elogind.xml
+++ b/
man/elogind.xml
@@
-21,7
+21,8
@@
along with elogind; If not, see <http://www.gnu.org/licenses/>.
-->
along with elogind; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="elogind">
+<refentry id="elogind"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>elogind</title>
<refentryinfo>
<title>elogind</title>
diff --git
a/man/loginctl.xml
b/man/loginctl.xml
index 46f1a990f8ffd2132f50bde6f00fa7407d9da9e8..0f638c260c4eaeb0cbe4be5366f1f56b584485ce 100644
(file)
--- a/
man/loginctl.xml
+++ b/
man/loginctl.xml
@@
-21,7
+21,8
@@
along with elogind; If not, see <http://www.gnu.org/licenses/>.
-->
along with elogind; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="loginctl" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="loginctl"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>loginctl</title>
<refentryinfo>
<title>loginctl</title>
diff --git
a/src/basic/missing.h
b/src/basic/missing.h
index 322cb5695b3d59c36acecb488677dc5f0cbde8a0..f2a0e1d8b0402605ace33e5a68db283e353e5948 100644
(file)
--- a/
src/basic/missing.h
+++ b/
src/basic/missing.h
@@
-442,7
+442,6
@@
struct btrfs_ioctl_quota_ctl_args {
#endif
#endif // 0
#endif
#endif // 0
-
#ifndef CGROUP_SUPER_MAGIC
#define CGROUP_SUPER_MAGIC 0x27e0eb
#endif
#ifndef CGROUP_SUPER_MAGIC
#define CGROUP_SUPER_MAGIC 0x27e0eb
#endif
diff --git
a/src/core/cgroup.h
b/src/core/cgroup.h
index 3b6299f2f5d2926a0eabc65488d3590c60d1a603..c3b87bfc5ce5249b6c49013caf1ebd8fb501fa0f 100644
(file)
--- a/
src/core/cgroup.h
+++ b/
src/core/cgroup.h
@@
-179,7
+179,6
@@
bool unit_cgroup_delegate(Unit *u);
int unit_notify_cgroup_empty(Unit *u);
#endif // 0
int unit_notify_cgroup_empty(Unit *u);
#endif // 0
-
int manager_notify_cgroup_empty(Manager *m, const char *group);
#if 0 /// UNNEEDED by elogind
int manager_notify_cgroup_empty(Manager *m, const char *group);
#if 0 /// UNNEEDED by elogind
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index 07dbcd5ad0bc120feec078a2a9b6a2ff8ab52479..2eeaf0b9ef0586fdf46f2d57b89d03b28d5e2d8e 100644
(file)
--- a/
src/login/loginctl.c
+++ b/
src/login/loginctl.c
@@
-1630,7
+1630,6
@@
static int loginctl_main(int argc, char *argv[], sd_bus *bus) {
if ((argc == optind) && (ACTION_CANCEL_SHUTDOWN == arg_action))
return elogind_cancel_shutdown(bus);
#endif // 1
if ((argc == optind) && (ACTION_CANCEL_SHUTDOWN == arg_action))
return elogind_cancel_shutdown(bus);
#endif // 1
-
return dispatch_verb(argc, argv, verbs, bus);
}
return dispatch_verb(argc, argv, verbs, bus);
}
@@
-1670,6
+1669,5
@@
finish:
#if 1 /// elogind has some own cleanups to do
elogind_cleanup();
#endif // 1
#if 1 /// elogind has some own cleanups to do
elogind_cleanup();
#endif // 1
-
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
diff --git
a/src/login/logind-action.c
b/src/login/logind-action.c
index 6b1b64229e797f4e78e43472def41ff67dc806de..82c061d62677b6907942391fbaddfde9d3060461 100644
(file)
--- a/
src/login/logind-action.c
+++ b/
src/login/logind-action.c
@@
-38,7
+38,6
@@
#include "sd-messages.h"
#include "strv.h"
#include "sd-messages.h"
#include "strv.h"
-
int manager_handle_action(
Manager *m,
InhibitWhat inhibit_key,
int manager_handle_action(
Manager *m,
InhibitWhat inhibit_key,
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 046caf7be0e4a21863b025338df8b557274d7c56..77a11bbfe276c9d6e07756e3931a0a83e978f3b2 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-52,7
+52,6
@@
static void manager_free(Manager *m);
static void manager_reset_config(Manager *m) {
static void manager_free(Manager *m);
static void manager_reset_config(Manager *m) {
-
#if 0 /// elogind does not support autospawning of vts
m->n_autovts = 6;
m->reserve_vt = 6;
#if 0 /// elogind does not support autospawning of vts
m->n_autovts = 6;
m->reserve_vt = 6;
@@
-83,7
+82,6
@@
static void manager_reset_config(Manager *m) {
m->kill_only_users = strv_free(m->kill_only_users);
m->kill_exclude_users = strv_free(m->kill_exclude_users);
m->kill_only_users = strv_free(m->kill_only_users);
m->kill_exclude_users = strv_free(m->kill_exclude_users);
-
#if 1 /// elogind needs an Add-On for sleep configuration
elogind_manager_reset_config(m);
#endif // 1
#if 1 /// elogind needs an Add-On for sleep configuration
elogind_manager_reset_config(m);
#endif // 1
@@
-122,7
+120,6
@@
static Manager *manager_new(void) {
if (r < 0)
goto fail;
#endif // 1
if (r < 0)
goto fail;
#endif // 1
-
m->udev = udev_new();
if (!m->udev)
goto fail;
m->udev = udev_new();
if (!m->udev)
goto fail;
@@
-214,7
+211,6
@@
static void manager_free(Manager *m) {
#if 0 /// elogind does not support autospawning of vts
safe_close(m->reserve_vt_fd);
#endif // 0
#if 0 /// elogind does not support autospawning of vts
safe_close(m->reserve_vt_fd);
#endif // 0
-
#if 1 /// elogind has to free its own data
elogind_manager_free(m);
#endif // 1
#if 1 /// elogind has to free its own data
elogind_manager_free(m);
#endif // 1
@@
-732,12
+728,14
@@
static int manager_connect_bus(Manager *m) {
if (r < 0)
return log_error_errno(r, "Failed to attach bus to event loop: %m");
if (r < 0)
return log_error_errno(r, "Failed to attach bus to event loop: %m");
-#if 1 /// elogind has to setup its release agent
+#if 0 /// elogind has to setup its release agent
+ return 0;
+#else
elogind_bus_setup_system(m);
r = elogind_setup_cgroups_agent(m);
elogind_bus_setup_system(m);
r = elogind_setup_cgroups_agent(m);
-#endif // 1
return r;
return r;
+#endif // 0
}
static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) {
}
static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) {
@@
-1287,8
+1285,7
@@
finish:
"STOPPING=1\n"
"STATUS=Shutting down...");
"STOPPING=1\n"
"STATUS=Shutting down...");
- if (m)
- manager_free(m);
+ manager_free(m);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}