services: add systemd-logind support

features.in/services/config.mk

@@ -6,6 +6,9 @@ use/services: sub/rootfs
 	@$(call xport,SERVICES_DISABLE)
 	@$(call xport,SYSTEMD_SERVICES_ENABLE)
 	@$(call xport,SYSTEMD_SERVICES_DISABLE)
+	@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)
+	@$(call xport,SYSTEMD_USER_SERVICES_DISABLE)
+
 
 use/services/lvm2-disable: use/services
 	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)

features.in/services/install2/image-scripts.d/10-services

@@ -26,7 +26,7 @@ switch() {
 	[ "$sname" = "$1" ] || shell_config_del "$STATUS" "$sname"
 
 	case "$2" in
-	on|off)
+	on|off|enabled|disabled)
 		shell_config_set "$STATUS" "$1" "$2";;
 	esac
 }
@@ -79,4 +79,27 @@ fi
 
 rm "$STATUS"
 
+# Enable|Disable logind services
+STATUS=`mktemp`
+CHECK_FILES=
+
+for f in systemd-user-enabled systemd-user-disabled; do
+	[ -s "$CONFDIR/$f" ] || continue
+	CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
+done
+
+for i in $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE;  do switch $i enabled;  done
+for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done
+
+SERVICES="$GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE"
+SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | sort -u)"
+
+for i in $SERVICES; do
+	onoff="$(shell_config_get "$STATUS" "$i")"
+	[ -n "$onoff" ] || continue
+	echo "$i" >> "$CONFDIR"/systemd-user-"$onoff"
+done
+
+rm "$STATUS"
+
 :

features.in/services/rootfs/image-scripts.d/10-services

@@ -4,6 +4,7 @@
 
 CHKCONFIG=
 SYSTEMCTL=
+SYSTEMD_USER=
 
 [ ! -x /sbin/chkconfig ] || CHKCONFIG=1
 [ ! -x /bin/systemctl  ] || SYSTEMCTL=1
@@ -19,7 +20,7 @@ switch() {
 	esac
 
 	{
-		[ -z "$SYSTEMCTL" ] || /bin/systemctl --no-reload $sc $1
+		[ -z "$SYSTEMCTL" ] || /bin/systemctl --no-reload $SYSTEMD_USER $sc $1
 		[ -z "$CHKCONFIG" ] || /sbin/chkconfig $1 $cc
 	} # 2>/dev/null
 }
@@ -37,4 +38,9 @@ CHKCONFIG=
 for i in $GLOBAL_SYSTEMD_SERVICES_ENABLE;  do switch $i on;  done
 for i in $GLOBAL_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
 
+# systemd-logind services
+SYSTEMD_USER='--user --global'
+for i in $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE;  do switch $i on;  done
+for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i off; done
+
 :