- rel 2; init uses /run/initctl now, so migrate to it

[packages/SysVinit.git] / sysvinit-alt-fixes.patch

diff --git a/sysvinit-alt-fixes.patch b/sysvinit-alt-fixes.patch
index 9cffa2ab59ed952e96202797e2b770a9f2de228b..5087e96d9552d93a9dacddba6b89ede58d53adbe 100644 (file)
--- a/sysvinit-alt-fixes.patch
+++ b/sysvinit-alt-fixes.patch
@@ -1,29 +1,6 @@
-diff -upk.orig sysvinit-2.86.orig/src/bootlogd.c sysvinit-2.86/src/bootlogd.c
---- sysvinit-2.86.orig/src/bootlogd.c  2007-01-06 14:37:36 +0000
-+++ sysvinit-2.86/src/bootlogd.c       2007-01-06 14:38:09 +0000
-@@ -232,6 +232,9 @@ int consolename(char *res, int rlen)
- #ifdef TIOCGDEV
-       if (ioctl(0, TIOCGDEV, &kdev) == 0)
-               return findtty(res, rlen, (dev_t)kdev);
-+#ifndef ENOIOCTLCMD
-+#define ENOIOCTLCMD 515
-+#endif
-       if (errno != ENOIOCTLCMD) return -1;
- #endif
- 
-diff -upk.orig sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
---- sysvinit-2.86.orig/src/init.c      2007-01-06 14:37:36 +0000
-+++ sysvinit-2.86/src/init.c   2007-01-06 14:38:09 +0000
-@@ -785,7 +785,7 @@ char **init_buildenv(int child)
-       for (n = 0; environ[n]; n++)
-               ;
-       n += NR_EXTRA_ENV + 8;
--      e = calloc(n, sizeof(char *));
-+      e = imalloc(n * sizeof(char *));
- 
-       for (n = 0; environ[n]; n++)
-               e[n] = istrdup(environ[n]);
-@@ -814,6 +814,9 @@ void init_freeenv(char **e)
+--- sysvinit-2.88dsf/src/init.c.wiget  2011-12-03 23:39:16.988206898 +0100
++++ sysvinit-2.88dsf/src/init.c        2011-12-03 23:47:53.761427001 +0100
+@@ -911,6 +911,9 @@ void init_freeenv(char **e)
  {
        int             n;
  
@@ -33,7 +10,7 @@ diff -upk.orig sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
        for (n = 0; e[n]; n++)
                free(e[n]);
        free(e);
-@@ -1834,7 +1837,7 @@ void re_exec(void)
+@@ -1976,7 +1979,7 @@ void re_exec(void)
        CHILD           *ch;
        sigset_t        mask, oldset;
        pid_t           pid;
@@ -42,13 +19,10 @@ diff -upk.orig sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
        int             fd;
  
        if (strchr("S0123456",runlevel) == NULL)
-@@ -1882,11 +1885,13 @@ void re_exec(void)
-               exit(0);
-       }
- 
--      /*
--       *      The existing init process execs a new init binary.
--       */
+@@ -2027,8 +2030,13 @@ void re_exec(void)
+       /*
+        *      The existing init process execs a new init binary.
+        */
 -      env = init_buildenv(0);
 -      execle(myname, myname, "--init", NULL, env);
 +      if (pid > 0) {
@@ -61,12 +35,4 @@ diff -upk.orig sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
  
        /*
         *      We shouldn't be here, something failed. 
-@@ -2557,7 +2562,7 @@ int telinit(const char *progname, int ar
-               if (!strchr("0123456789SsQqAaBbCcUu", argv[optind][0]))
-                       usage(progname);
-               request.cmd = INIT_CMD_RUNLVL;
--              request.runlevel  = env ? 0 : argv[optind][0];
-+              request.runlevel  = argv[optind][0];
-               request.sleeptime = sltime;
-       }
- 
+