shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-21 05:57:34 +03:00
Code

main: add URL to cgroups check message

Browse Source
This commit is contained in:
Lennart Poettering 2012-04-11 12:48:27 +02:00
parent cc527a4734
commit 966a5d37c3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -1097,7 +1097,8 @@ static struct dual_timestamp* parse_initrd_timestamp(struct dual_timestamp *t) {
assert(t); assert(t);
if (!(e = getenv("RD_TIMESTAMP"))) e = getenv("RD_TIMESTAMP");
if (!e)
return NULL; return NULL;
if (sscanf(e, "%llu %llu", &a, &b) != 2) if (sscanf(e, "%llu %llu", &a, &b) != 2)
@ -1150,7 +1151,8 @@ static void test_cgroups(void) {
"Systems without control groups are not supported. " "Systems without control groups are not supported. "
"We will now sleep for 10s, and then continue boot-up. " "We will now sleep for 10s, and then continue boot-up. "
"Expect breakage and please do not file bugs. " "Expect breakage and please do not file bugs. "
"Instead fix your kernel and enable CONFIG_CGROUPS." ); "Instead fix your kernel and enable CONFIG_CGROUPS. "
"Consult http://0pointer.de/blog/projects/cgroups-vs-cgroups.html for more information.");
sleep(10); sleep(10);
} }
@ -1311,7 +1313,8 @@ int main(int argc, char *argv[]) {
/* Remember open file descriptors for later deserialization */ /* Remember open file descriptors for later deserialization */
if (serialization) { if (serialization) {
if ((r = fdset_new_fill(&fds)) < 0) { r = fdset_new_fill(&fds);
if (r < 0) {
log_error("Failed to allocate fd set: %s", strerror(-r)); log_error("Failed to allocate fd set: %s", strerror(-r));
goto finish; goto finish;
} }