From: Davin McCall <davmac@davmac.org>
Date: Sun, 6 Sep 2015 17:34:27 +0000 (+0100)
Subject: Filter "auto" from the command line. LILO adds it automatically for
X-Git-Tag: v0.01~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=baceb78491555095ca35d4e9ce8d5eae1f49a63f;p=oweals%2Fdinit.git

Filter "auto" from the command line. LILO adds it automatically for
non-interactive boots; we can just ignore it.
---

diff --git a/dinit.cc b/dinit.cc
index d54e8d6..2f28292 100644
--- 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]);
+            }
         }
       }
     }