User Services

README.md

@@ -1,9 +1,11 @@
-OpenRC README
+openrc-navi
 =============
 
 OpenRC is a dependency-based init system that works with the
 system-provided init program, normally `/sbin/init`.
 
+This fork provides extra functionality like user services.
+
 ## building and installing
 
 OpenRC uses the  [meson](http://mesonbuild.com) build system, so use the
@@ -34,19 +36,18 @@ remove them and then install so that the OS hooks into OpenRC.
 
 ## Discussions
 
-We are testing [discussions](https://github.com/OpenRC/openrc/discussions), so
+We are testing [discussions](https://github.com/navi-desu/openrc/discussions), so
 feel free to open topics there.
 
 ## Reporting Bugs
 
-Please report bugs on our [bug tracker](http://github.com/OpenRC/openrc/issues).
+Please report bugs on our [bug tracker](http://github.com/navi-desu/openrc/issues).
 
 If you can contribute code , please feel free to do so by opening
 [pull requests](https://github.com/OpenRC/openrc/pulls).
 
 ## IRC Channel
 
-We have an official irc channel, #openrc on the libera network.
-Please connect your irc client to irc.libera.chat and join #openrc on
+We have an official irc channel, #navi on the libera network.
+Please connect your irc client to irc.libera.chat and join #navi on
 that network.
-

init.d/bootmisc.in

@@ -169,10 +169,12 @@ start()
 		# Satisfy Linux FHS
 		extra=/var/lib/misc
 		if [ ! -d /run ]; then
-			extra="/var/run $extra"
+			extra="/var/run /var/run/user $extra"
+		elif [ ! -d /run/user ]; then
+			extra="/run/user $extra"
 		fi
 	else
-		extra=/var/run
+		extra="/var/run /var/run/user"
 	fi
 	for x in /var/log /tmp $extra; do
 		if ! [ -d $x ]; then

init.d/meson.build

@@ -10,12 +10,13 @@ init_common =  [
   'netmount.in',
   'osclock.in',
   'root.in',
+  'runsvdir.in',
+  's6-svscan.in',
   'savecache.in',
   'swap.in',
   'swclock.in',
   'sysctl.in',
-  'runsvdir.in',
-  's6-svscan.in',
+  'user.in',
   ]
 
 if get_option('newnet')

init.d/user.in

@@ -0,0 +1,48 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2017 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="starts an openrc session for an user"
+user="${RC_SVCNAME#*.}"
+
+extra_started_commands="runtime_directory"
+
+runtime_directory() {
+	service_get_value xdg_runtime_dir
+}
+
+start_pre() {
+	if [ "$user" = "$RC_SVCNAME" ]; then
+		eerror "${RC_SVCNAME} cannot be started directly. You must create"
+		eerror "symbolic links to it for the users you want to start"
+		return 1
+	fi
+
+	if [ -z "$XDG_RUNTIME_DIR" ]; then
+		export XDG_RUNTIME_DIR="/run/user/$(id -u $user)"
+		checkpath -d -o "$user:$user" "$XDG_RUNTIME_DIR" || return 1
+	fi
+
+	service_set_value xdg_runtime_dir "$XDG_RUNTIME_DIR"
+}
+
+start() {
+	ebegin "Starting user session for $user"
+	user_init $user start
+	eend $?
+	return 0
+}
+
+stop() {
+	ebegin "Stopping user session for $user"
+	user_init $user stop
+	eend $?
+	return 0
+}

meson.build

@@ -1,12 +1,13 @@
 project('OpenRC', 'c',
-  version : '0.54',
+  version : '0.60-beta3',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
     'prefix=/usr',
     'warning_level=3',
     ],
-  meson_version : '>=0.53.2')
+  meson_version : '>=0.56.0' # pkgconfig dict support
+)
 
 cc = meson.get_compiler('c')
 fs = import('fs')
@@ -207,14 +208,37 @@ subdir('etc')
 subdir('init.d')
 subdir('local.d')
 subdir('man')
-subdir('pkgconfig')
 subdir('sh')
 subdir('src')
 subdir('support')
 subdir('sysctl.d')
 subdir('test')
 subdir('zsh-completion')
 
+if get_option('pkgconfig')
+  pkg = import('pkgconfig')
+
+  einfo_pkgconf = pkg.generate(
+    name : 'einfo',
+    description : 'Pretty console informational display',
+    version : meson.project_version(),
+    libraries : libeinfo,
+    subdirs : ['einfo'],
+  )
+
+  openrc_pkgconf = pkg.generate(
+    name : 'OpenRC',
+    filebase : 'openrc',
+    description : 'Universal init system',
+    version : meson.project_version(),
+    libraries : librc,
+    subdirs : ['openrc'],
+    variables: {
+      'rc_path': rc_libexecdir,
+    }
+  )
+endif
+
 meson.add_install_script('tools/meson_runlevels.sh',
   os,
   get_option('newnet') ? 'yes' : 'no',

sh/gendepends.sh.in

@@ -53,11 +53,21 @@ depend() {
 	:
 }
 
+_dirs="
+	@SYSCONFDIR@/init.d
+	@PKG_PREFIX@/etc/init.d
+	@LOCAL_PREFIX@/etc/init.d
+"
+
+if yesno "$RC_USER_SERVICES"; then
+	_dirs="
+		@SYSCONFDIR@/user.d/init.d
+		${XDG_CONFIG_HOME:-${HOME}/.config}/openrc/init.d
+	"
+fi
+
 _done_dirs=
-for _dir in \
-@SYSCONFDIR@/init.d \
-@PKG_PREFIX@/etc/init.d \
-@LOCAL_PREFIX@/etc/init.d
+for _dir in ${_dirs}
 do
 	[ -d "$_dir" ] || continue
 
@@ -127,3 +137,4 @@ do
 		)
 	done
 done
+unset _dirs

sh/meson.build

@@ -28,6 +28,7 @@ sh_config = [
 scripts_config = [
   'gendepends.sh.in',
   'openrc-run.sh.in',
+  'user-init.sh.in',
   ]
 
 if os == 'Linux'

sh/openrc-run.sh.in

@@ -43,7 +43,7 @@ sourcex "@LIBEXECDIR@/sh/functions.sh"
 sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
 case $RC_SYS in
 	PREFIX|SYSTEMD-NSPAWN) ;;
-	*) sourcex -e "@LIBEXECDIR@/sh/rc-cgroup.sh";;
+	*) yesno "$RC_USER_SERVICES" || sourcex -e "@LIBEXECDIR@/sh/rc-cgroup.sh";;
 esac
 
 # Support LiveCD foo
@@ -220,7 +220,7 @@ if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
 	done
 fi
 
-_conf_d=${RC_SERVICE%/*}/../conf.d
+_conf_d="${RC_SYSCONF_DIR}/conf.d"
 # If we're net.eth0 or openvpn.work then load net or openvpn config
 _c=${RC_SVCNAME%%.*}
 if [ -n "$_c" -a "$_c" != "$RC_SVCNAME" ]; then

sh/user-init.sh.in

@@ -0,0 +1,30 @@
+#!@SHELL@
+
+. @LIBEXECDIR@/sh/functions.sh
+
+sourcex()
+{
+	if [ "$1" = "-e" ]; then
+		shift
+		[ -e "$1" ] || return 1
+	fi
+	if ! . "$1"; then
+		eerror "$RC_SVCNAME: error loading $1"
+		exit 1
+	fi
+}
+
+_sysconf="${XDG_CONFIG_HOME:-${HOME}/.config}/openrc"
+
+sourcex -e "@SYSCONFDIR@/rc.conf"
+sourcex -e "$_sysconf/rc.conf"
+
+case $1 in
+	start) _runlevel="${rc_user_runlevel:-default}";;
+	stop) _runlevel="${rc_user_shutdown_runlevel:-none}";;
+	*) eerror "no argument given to $0"r exit 1
+esac
+
+mkdir -p "$_sysconf/runlevels/$_runlevel"
+
+openrc --user "$_runlevel"

src/libeinfo/libeinfo.c

@@ -133,6 +133,7 @@ static const char *const color_terms[] = {
 	"xterm",
 	"xterm-debian",
 	"xterm-kitty",
+	"foot",
 	NULL
 };
 

src/librc/librc-daemon.c

@@ -411,9 +411,8 @@ rc_service_daemon_set(const char *service, const char *exec,
 		return false;
 	}
 
-	xasprintf(&dirpath, RC_SVCDIR "/daemons/%s", basename_c(service));
-
 	/* Regardless, erase any existing daemon info */
+	xasprintf(&dirpath, "%s/daemons/%s", rc_service_dir(), basename_c(service));
 	if ((dp = opendir(dirpath))) {
 		match = _match_list(exec, argv, pidfile);
 		renamelist = rc_stringlist_new();
@@ -491,7 +490,7 @@ rc_service_started_daemon(const char *service,
 	if (!service || !exec)
 		return false;
 
-	xasprintf(&dirpath, RC_SVCDIR "/daemons/%s", basename_c(service));
+	xasprintf(&dirpath, "%s/daemons/%s", rc_service_dir(), basename_c(service));
 	match = _match_list(exec, argv, NULL);
 
 	if (indx > 0) {
@@ -543,9 +542,8 @@ rc_service_daemons_crashed(const char *service)
 	char *ch_root;
 	char *spidfile;
 
-	path += snprintf(dirpath, sizeof(dirpath), RC_SVCDIR "/daemons/%s",
-	    basename_c(service));
-
+	path += snprintf(dirpath, sizeof(dirpath),
+			"%s/daemons/%s", rc_service_dir(), basename_c(service));
 	if (!(dp = opendir(dirpath)))
 		return false;