From 27c594dd0b322ab22ee7ce0f1b31db42c64eea9a Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@alpinelinux.org>
Date: Wed, 21 Feb 2018 20:20:48 +0000
Subject: main/openrc: fix netboot and rename unionfs

- do not re-download the modloop on netboot when restarting service
- rename unionfs to overlayfs (including the conf.d variable)
- allow size setting to 0 to mount with default size
---
 main/openrc/APKBUILD      |  6 +++---
 main/openrc/modloop.confd |  9 ++++++---
 main/openrc/modloop.initd | 37 ++++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 23 deletions(-)

(limited to 'main/openrc')

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 060c253cf4..d7059c8552 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.24.1
 _ver=${pkgver/_git*/}
-pkgrel=4
+pkgrel=5
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://gitweb.gentoo.org/proj/openrc.git"
 arch="all"
@@ -84,7 +84,7 @@ dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a
 c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55  hwdrivers.initd
 584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca  keymaps.initd
 b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a  modules.initd
-92c0245ba4d7cc6828a9b68510fb541cf3b21b9b844a858336af60e84d1db62ddb4471aad0d82ef05d639335a81014f8350a71a746c2bcd90697daa6a8c03408  modloop.initd
+27c036a2c07f658f7fb1e066c59dc494674ba0d81bcb85fea9caffec28ee537eb11e863e20aa4b1c88607f12496ac66d5b092c787c86ff8b8a80e423a8d99440  modloop.initd
 55df0ac13dac1f215f0c573ac07b150d31232a5204eccfc8941d5af73f91b4535a85d79b7f6514217038ecbe6bffa28cb83fd8d46fd4c596e07103deb8bc8a57  networking.initd
-aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689  modloop.confd
+80e43ded522e2d48b876131c7c9997debd43f3790e0985801a8c1dd60bc6e09f625b35a127bf225eb45a65eec7808a50d1c08a5e8abceafc61726211e061e0a2  modloop.confd
 d76c75c58e6f4b0801edac4e081b725ef3d50a9a8c9bbb5692bf4d0f804af7d383bf71a73d5d03ed348a89741ef0b2427eb6a7cbf5a9b9ff60a240639fa6ec88  sysfsconf.initd"
diff --git a/main/openrc/modloop.confd b/main/openrc/modloop.confd
index de4cbb62b8..69664291f4 100644
--- a/main/openrc/modloop.confd
+++ b/main/openrc/modloop.confd
@@ -1,3 +1,6 @@
-# enable loadable module support when running from RAM
-# when unionfs support is available in the kernel
-unionfs_size="32M"
+# Enable loadable module support when running from RAM
+# when OverlayFS support is available in the kernel.
+# 0 means default tmpfs size (50% of physical RAM).
+# for more information please see kernel documention at:
+# https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
+overlay_size=0
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 9d664dd403..dcc43448b1 100644
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -53,8 +53,8 @@ start() {
 	mkdir -p /.modloop /lib
 	case "$KOPT_modloop" in
 		http://*|https://*|ftp://*)
-			wget -P "$modloop_dldir" "$KOPT_modloop" \
-				&& modloop=$modloop_dldir/$(basename $KOPT_modloop)
+			modloop=$modloop_dldir/${KOPT_modloop##*/}
+			[ ! -f "$modloop" ] && wget -P "$modloop_dldir" "$KOPT_modloop"
 			;;
 		*)
 			for dir in $(mountdirs); do
@@ -86,12 +86,17 @@ start() {
 	fi
 
 	#use overlayfs if available and configured
-	if grep -q -w "overlay$" /proc/filesystems && [ -n "$unionfs_size" ]; then
+	if grep -q -w "overlay$" /proc/filesystems && [ ! -z ${unionfs_size+x} ]; then
+		ewarn "Use of unionfs_size is deprecated use overlay_size instead"
+		overlay_size="$unionfs_size"
+	fi
+	if grep -q -w "overlay$" /proc/filesystems && [ -n "$overlay_size" ]; then
 		ebegin "OverlayFS detected, mounting modloop rw"
-		mkdir -p /.modunisonfs /lib/modules
-		mount -t tmpfs -o size="$unionfs_size" tmpfs /.modunisonfs
-		mkdir -p /.modunisonfs/modules /.modunisonfs/work
-		mount -t overlay -o upperdir=/.modunisonfs/modules,lowerdir=/.modloop/modules,workdir=/.modunisonfs/work overlay /lib/modules
+		[ "$overlay_size" != 0 ] && mount_ops="-o size=$overlay_size"
+		mkdir -p /.modoverlayfs /lib/modules
+		mount -t tmpfs $mount_ops tmpfs /.modoverlayfs
+		mkdir -p /.modoverlayfs/modules /.modoverlayfs/work
+		mount -t overlay -o upperdir=/.modoverlayfs/modules,lowerdir=/.modloop/modules,workdir=/.modoverlayfs/work overlay /lib/modules
 		eend $? || return 1
 	else
 		rm -rf /lib/modules && ln -sf /.modloop/modules /lib/
@@ -110,15 +115,13 @@ start() {
 }
 
 stop() {
-	local rc=0
-	if mountinfo --quiet /.modunisonfs/modules && mountinfo --quiet /lib/modules; then
-		umount /lib/modules
-		umount /.modunisonfs/modules
-	fi
-	if mountinfo --quiet /.modloop; then
-		ebegin "Unmounting /.modloop"
-		umount -d /.modloop
-		eend $? || return 1
-	fi
+	local ret=0
+	local mnt; for mnt in /lib/modules /.modoverlayfs /.modloop; do
+		if mountinfo --quiet "$mnt"; then
+			ebegin "Unmounting $mnt"
+			umount -d "$mnt" || ret=1
+		fi
+	done
+	eend $ret || return 1
 }
 
-- 
cgit v1.2.3