- updated nopowerstates-single patch

diff --git a/sysvinit-nopowerstates-single.patch b/sysvinit-nopowerstates-single.patch
index c3087b1178875cf63efcfa54cf671f11e7c6432a..fd8ce931d1975ab6ab52bb2798ea28bcefcfe8a5 100644 (file)
--- a/sysvinit-nopowerstates-single.patch
+++ b/sysvinit-nopowerstates-single.patch
@@ -1,11 +1,11 @@
---- sysvinit-2.86/src/init.c.single    2005-12-21 12:21:04.000000000 -0500
-+++ sysvinit-2.86/src/init.c   2005-12-21 12:21:40.000000000 -0500
-@@ -1153,7 +1153,7 @@
-                *      See if we have a single user entry.
-                */
-               for(old = newFamily; old; old = old->next)
--                      if (strpbrk(old->rlevel, "S")) break;
-+                      if (strpbrk(old->rlevel, "S") && !ISPOWER(old->action)) break;
-               if (old == NULL)
-                       snprintf(buf, sizeof(buf), "~~:S:wait:%s\n", SHELL);
-               else
+--- sysvinit-2.98/src/init.c.orig      2020-11-27 22:45:28.430317602 +0100
++++ sysvinit-2.98/src/init.c   2020-11-28 08:02:50.399146908 +0100
+@@ -1490,7 +1490,7 @@
+                        *      See if we have a single user entry.
+                        */
+                       for(old = newFamily; old; old = old->next)
+-                              if (strpbrk(old->rlevel, "S"))  break;
++                              if (strpbrk(old->rlevel, "S") && !ISPOWER(old->action)) break;
+                       if (old == NULL)
+                               snprintf(buf, sizeof(buf), "~~:S:wait:%s\n", SULOGIN);
+                       else