projects
/
oweals
/
dinit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7ae70e
)
Filter "auto" from the command line. LILO adds it automatically for
author
Davin McCall
<davmac@davmac.org>
Sun, 6 Sep 2015 17:34:27 +0000
(18:34 +0100)
committer
Davin McCall
<davmac@davmac.org>
Sun, 6 Sep 2015 17:34:27 +0000
(18:34 +0100)
non-interactive boots; we can just ignore it.
dinit.cc
patch
|
blob
|
history
diff --git
a/dinit.cc
b/dinit.cc
index d54e8d69765c0e1c44001739b562c8f6ac1d4f54..2f282922e3a8b9ec4a5565905aeadeae644d6d95 100644
(file)
--- a/
dinit.cc
+++ b/
dinit.cc
@@
-130,7
+130,10
@@
int main(int argc, char **argv)
}
}
else {
- services_to_start.push_back(argv[i]);
+ // LILO puts "auto" on the kernel command line for unattended boots; we'll filter it.
+ if (! am_system_init || strcmp(argv[i], "auto") != 0) {
+ services_to_start.push_back(argv[i]);
+ }
}
}
}