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:
5273510
)
readahead: rather than checking for virtualization in the C code, use ConditionVirtua...
author
Lennart Poettering
<lennart@poettering.net>
Tue, 24 Apr 2012 11:12:29 +0000
(13:12 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 24 Apr 2012 11:14:40 +0000
(13:14 +0200)
TODO
patch
|
blob
|
history
src/readahead/readahead-collect.c
patch
|
blob
|
history
src/readahead/readahead-replay.c
patch
|
blob
|
history
units/systemd-readahead-collect.service.in
patch
|
blob
|
history
units/systemd-readahead-replay.service.in
patch
|
blob
|
history
diff --git
a/TODO
b/TODO
index e38c1105a4c81b0be57ad01f912158d8f50d513e..3683e6a5496b0b4b8a0a0688f39d839cc0492111 100644
(file)
--- a/
TODO
+++ b/
TODO
@@
-21,6
+21,8
@@
Bugfixes:
Features:
Features:
+* fedora: make sshd and pam_loginuid work in nspawn containers
+
* fix utmp for console logins in containers
* Add pretty name for seats in logind
* fix utmp for console logins in containers
* Add pretty name for seats in logind
diff --git
a/src/readahead/readahead-collect.c
b/src/readahead/readahead-collect.c
index 3e91d5c28a16ac2389ed3e97baa8bbd28a5ff4bc..008ede3964996a5e85c33cdd02370d8f0c625052 100644
(file)
--- a/
src/readahead/readahead-collect.c
+++ b/
src/readahead/readahead-collect.c
@@
-660,11
+660,17
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if ((r = parse_argv(argc, argv)) <= 0)
+ r = parse_argv(argc, argv);
+ if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
root = optind < argc ? argv[optind] : "/";
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
root = optind < argc ? argv[optind] : "/";
+ /* Skip this step on read-only media. Note that we check the
+ * underlying block device here, not he read-only flag of the
+ * file system on top, since that one is most likely mounted
+ * read-only anyway at boot, even if the underlying block
+ * device is theoretically writable. */
if (fs_on_read_only(root) > 0) {
log_info("Disabling readahead collector due to read-only media.");
return 0;
if (fs_on_read_only(root) > 0) {
log_info("Disabling readahead collector due to read-only media.");
return 0;
@@
-675,12
+681,8
@@
int main(int argc, char *argv[]) {
return 0;
}
return 0;
}
- if (detect_virtualization(NULL) > 0) {
- log_info("Disabling readahead collector due to execution in virtualized environment.");
- return 0;
- }
-
- if (!(shared = shared_get()))
+ shared = shared_get();
+ if (!shared)
return 1;
shared->collect = getpid();
return 1;
shared->collect = getpid();
diff --git
a/src/readahead/readahead-replay.c
b/src/readahead/readahead-replay.c
index 7c263f6e5382e4053795278bebc762996ee055e8..f91020e805fd44cc92ad2c446ea96d4965239183 100644
(file)
--- a/
src/readahead/readahead-replay.c
+++ b/
src/readahead/readahead-replay.c
@@
-350,7
+350,8
@@
int main(int argc, char*argv[]) {
umask(0022);
umask(0022);
- if ((r = parse_argv(argc, argv)) <= 0)
+ r = parse_argv(argc, argv);
+ if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
root = optind < argc ? argv[optind] : "/";
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
root = optind < argc ? argv[optind] : "/";
@@
-360,12
+361,8
@@
int main(int argc, char*argv[]) {
return 0;
}
return 0;
}
- if (detect_virtualization(NULL) > 0) {
- log_info("Disabling readahead replay due to execution in virtualized environment.");
- return 0;
- }
-
- if (!(shared = shared_get()))
+ shared = shared_get();
+ if (!shared)
return 1;
shared->replay = getpid();
return 1;
shared->replay = getpid();
diff --git
a/units/systemd-readahead-collect.service.in
b/units/systemd-readahead-collect.service.in
index 63840b916b256f56b4b855edc8ce05089b0f2339..c5e1d5274f84c2d3b760aadb183a1479a2c836b8 100644
(file)
--- a/
units/systemd-readahead-collect.service.in
+++ b/
units/systemd-readahead-collect.service.in
@@
-11,6
+11,7
@@
DefaultDependencies=no
Wants=systemd-readahead-done.timer
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
Wants=systemd-readahead-done.timer
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
+ConditionVirtualization=no
[Service]
Type=notify
[Service]
Type=notify
diff --git
a/units/systemd-readahead-replay.service.in
b/units/systemd-readahead-replay.service.in
index ad27395d9ab1eabfeee6a1167da2992692395220..7387ebac085df8a89d96390456f96f77eecda072 100644
(file)
--- a/
units/systemd-readahead-replay.service.in
+++ b/
units/systemd-readahead-replay.service.in
@@
-11,6
+11,7
@@
DefaultDependencies=no
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
ConditionPathExists=/.readahead
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
ConditionPathExists=/.readahead
+ConditionVirtualization=no
[Service]
Type=notify
[Service]
Type=notify