Update ChangeLog and bump version for v4.5-rc2

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

.github/workflows/weekly.yml

@@ -15,6 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check for any commits since last week
+        id: schedule
         run: |
           commits="$(git log --format=%H --since='1 week ago')"
           if [ -n "$commits" ]; then
@@ -22,10 +23,9 @@ jobs:
           else
               echo "run=false" >> $GITHUB_OUTPUT
           fi
-
   distcheck:
     needs: schedule
-    if: ${{ needs.schedule.outputs.run == 'true' }}
+    if: ${{ needs.schedule.outputs.run }}
     runs-on: ubuntu-latest
     steps:
       - name: Install dependencies

ChangeLog.md

@@ -4,7 +4,7 @@ Change Log
 All relevant changes are documented in this file.
 
 
-[4.5][] - 2023-09-14
+[4.5][] - 2023-09-15
 --------------------
 
 ### Changes
@@ -26,6 +26,7 @@ All relevant changes are documented in this file.
   hierarchy in `/etc/finit.d/`
 - The `runparts` code has been split into `/libexec/finit/runparts`
 - Add SysV Init Compatibility section to documentation
+- Increased MAX path for commands, and arguments: 64 -> 256
 
 ### Fixes
 - Fix #227: believed to have been fixed in [4.3][], the root cause was

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Finit],[4.5-rc1],[https://github.com/troglobit/finit/issues],[finit],[https://troglobit.com/projects/finit/])
+AC_INIT([Finit],[4.5-rc2],[https://github.com/troglobit/finit/issues],[finit],[https://troglobit.com/projects/finit/])
 AC_CONFIG_AUX_DIR(aux)
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects])
 AM_SILENT_RULES([yes])

plugins/modules-load.c

@@ -101,7 +101,7 @@ static int modules_load(const char *file, int index)
 	}
 
 	while ((line = fparseln(fp, NULL, NULL, NULL, 0))) {
-		char cmd[CMD_SIZE * 2], *mod, *args, *set;
+		char cmd[CMD_SIZE], *mod, *args, *set;
 
 		/*
 		 * fparseln() skips regular UNIX comments only.

src/finit.h

@@ -60,7 +60,7 @@
 #define _PATH_SULOGIN           FINIT_EXECPATH_ "/sulogin"
 #define _PATH_GETTY             FINIT_EXECPATH_ "/getty"
 
-#define CMD_SIZE                256
+#define CMD_SIZE                1024
 #define LINE_SIZE               1024
 #define BUF_SIZE                4096
 

src/svc.h

@@ -85,6 +85,7 @@ typedef enum {
 
 #define MAX_ID_LEN       16
 #define MAX_ARG_LEN      64
+#define MAX_CMD_LEN      256
 #define MAX_IDENT_LEN    (MAX_ARG_LEN + MAX_ID_LEN + 1)
 #define MAX_STR_LEN      64
 #define MAX_COND_LEN     (MAX_ARG_LEN * 3)
@@ -118,7 +119,7 @@ typedef struct svc {
 	int            sighalt;        /* Signal to stop process, default: SIGTERM */
 	int            killdelay;      /* Delay in msec before sending SIGKILL */
 	pid_t          oldpid, pid;
-	char           pidfile[256];
+	char           pidfile[MAX_CMD_LEN];
 	long           start_time;     /* Start time, as seconds since boot, from sysinfo() */
 	int            started;	       /* Set for run/task/sysv to track if started */
 	int            status;	       /* From waitpid() when process is collected */
@@ -181,15 +182,15 @@ typedef struct svc {
 	char	       group[MAX_USER_LEN];
 
 	/* Command, arguments and service description */
-	char	       cmd[MAX_ARG_LEN];
-	char	       args[MAX_NUM_SVC_ARGS][MAX_ARG_LEN];
+	char	       cmd[MAX_CMD_LEN];
+	char	       args[MAX_NUM_SVC_ARGS][MAX_CMD_LEN];
 	int            args_dirty;
 	char           conflict[MAX_ARG_LEN];
 	char	       desc[MAX_STR_LEN];
-	char	       env[MAX_ARG_LEN];
-	char	       pre_script[MAX_ARG_LEN];
-	char	       post_script[MAX_ARG_LEN];
-	char	       ready_script[MAX_ARG_LEN];
+	char	       env[MAX_CMD_LEN];
+	char	       pre_script[MAX_CMD_LEN];
+	char	       post_script[MAX_CMD_LEN];
+	char	       ready_script[MAX_CMD_LEN];
 
 	/*
 	 * Used to forcefully kill services that won't shutdown on

test/Makefile.am

@@ -2,7 +2,9 @@ SUBDIRS                  = lib src
 
 EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env  \
 			   skel/bin/pre.sh skel/bin/post.sh skel/bin/ready.sh skel/bin/slay  \
-			   skel/sbin/fail.sh			     			     \
+			   skel/sbin/fail.sh skel/usr/share/runlevel/ref.log		     \
+			   skel/etc/rc.d/foo.sh skel/etc/rc.d/S01abc.sh			     \
+			   skel/etc/rc.d/test.sh skel/etc/rc.d/S02def.sh		     \
 			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	     \
 			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		     \
 			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	     \

test/lib/setup.sh

@@ -334,7 +334,7 @@ echo "$finit_ppid" > "$SYSROOT"/running_test.pid
 log "$color_reset" 'Setup of test environment done, waiting for Finit ...' ''
 
 finit_pid=$(retry "pgrep -P $finit_ppid")
-echo "Finit running as $finit_pid"
+echo "Finit running as PID $finit_pid"
 #tty=/dev/$(texec cat /sys/class/tty/console/active)
 #texec cat "$tty" &