Update ChangeLog

Remove the IFS manipulation and simplify the loop that processes the
settings.

ChangeLog

@@ -1,3 +1,71 @@
+commit b731c02a389303dfba30a4b6c44efd0c2540bf66
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Clean up cgroups v2 code
+    
+    Remove the IFS manipulation and simplify the loop that processes the
+    settings.
+
+commit c42916ea199c0eab35c6c0a72d9a9f2a326144b0
+Author: Scall <Scall@users.noreply.github.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d: swap should always be started after root
+    
+    Otherwise if a swap file is being used, and swap is started before
+    root, swapon may fail because of a read-only filesystem.
+
+commit f973354ccdcf4d94b19f08c68a14b2a004668c72
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.3
+
+commit 69349f7b57116572b95874c754b2ef87c552cf0d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 1b1a70ecca43034cb0770e18e287ccbca9f1eb52
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.2
+
+commit 05cfbb8348cf92bcc2edd922af1dc0a4c4c2e1f4
+Author: Chris Cromer <cromerc@users.noreply.github.com>
+Commit: Doug Freed <dwfreed@mtu.edu>
+
+    openrc-run: fix memory size (#213)
+    
+    Fixes #212
+
+commit a70b65f851c4f79e4fd43440d500d23cbf4b4a89
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit 0660d2455d461d648cf45076cf63b1c03e8e24c0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix build on FreeBSD
+
+commit 01c5b98d3842c8142891d4b88f21823f4042f594
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.35.1
+
+commit f62975a1f8c4d5d4abdf78d8cad5509216138f03
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit 5bb6f9aa318a6d0507971b74d88c3fd2803bae4b
 Author: Jason Zaman <jason@perfinion.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1804,43 +1872,3 @@ Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     version 0.25
-
-commit fde3902d069dfdce9c59555186a5541d6d99c8aa
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update ChangeLog
-
-commit d7bbb0f5830e1ec4df1ec52714d70ac6b0a81878
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add agetty service
-    
-    The agetty service is an alternate way to manage gettys with agetty
-    under Linux which is separate from an external init system.
-
-commit 21ca2b746cce67e2b3578fb7015c9d4c243e3a0c
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: drop modules completely from the dependencies
-    
-    This is for #112.
-
-commit 6a79aef0159d7035778fd852b26ecfac903cd029
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs: Do not load efivarfs module
-    
-    My understanding is that the kernel can autoload this module. If it
-    doesn't, the module should be built in or loaded from an initramfs.
-    
-    This fixes https://github.com/openrc/openrc/pulls/112.
-
-commit 4a269674b765e5267f024fa55c8644480a7304ea
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    make sure netmount and localmount start after root

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.35
+VERSION=	0.35.3
 PKG=		${NAME}-${VERSION}

init.d/swap.in

@@ -11,7 +11,7 @@
 
 depend()
 {
-	after clock
+	after clock root
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

mk/os-FreeBSD.mk

@@ -11,3 +11,5 @@
 # Generic definitions
 
 include ${MK}/os-BSD.mk
+
+CPPFLAGS+=	-D_WITH_GETLINE

sh/rc-cgroup.sh.in

@@ -184,18 +184,17 @@ cgroup2_set_limits()
 	cgroup_path="$(cgroup2_find_path)"
 	[ -d "${cgroup_path}" ] || return 0
 	rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}"
-	local OIFS="$IFS"
-	IFS="
-"
 	[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
-	printf "%d" 0 > "${rc_cgroup_path}/cgroup.procs"
+	[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
-	echo "${rc_cgroup_settings}" | while IFS="$OIFS" read -r key value; do
+		printf 0 > "${rc_cgroup_path}"/cgroup.procs
-		[ -z "${key}" ] || [ -z "${value}" ] && continue
+	[ -z "${rc_cgroup_settings}" ] && return 0
-		[ ! -e "${rc_cgroup_path}/${key}" ] && continue
+	echo "${rc_cgroup_settings}" | while read -r key value; do
-		veinfo "${RC_SVCNAME}: cgroups: ${key} ${value}"
+		[ -z "${key}" ] && continue
-		printf "%s" "${value}" > "${rc_cgroup_path}/${key}"
+		[ -z "${value}" ] && continue
+		[ ! -f "${rc_cgroup_path}/${key}" ] && continue
+		veinfo "${RC_SVCNAME}: cgroups: setting ${key} to ${value}"
+		printf "%s\n" "${value}" > "${rc_cgroup_path}/${key}"
 	done
-	IFS="$OIFS"
 	return 0
 }
 

src/rc/openrc-run.c

@@ -1152,7 +1152,7 @@ int main(int argc, char **argv)
 	}
 	lnk = xmalloc(4096);
 	memset(lnk, 0, 4096);
-	if (readlink(argv[1], lnk, sizeof(lnk)-1)) {
+	if (readlink(argv[1], lnk, 4096)) {
 		dir = dirname(path);
 		if (strchr(lnk, '/')) {
 			save = xstrdup(dir);