=== modified file 'xpra-skel/homedir/bin/clip2'
--- old/xpra-skel/homedir/bin/clip2	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/bin/clip2	2024-08-04 09:32:40 +0000
@@ -20,7 +20,7 @@
 scan() {
 	local d f mtime
 	local -a found files stat
-	for d in /run/xclipring/*/*(/); do
+	for d in /run/xpra/*-*; do
 		local -a l=( $d/*(.Nom) )
 		for f in $l[1,2]; do
 			zstat -A stat +mtime $f || exit $?
@@ -33,8 +33,8 @@
 	for f in $sorted; do
 		mtime=${f%%|*}
 		f=${f#*|}
-		found=( $map/${f:h:t}=*(N) )
-		clipboards+=( $mtime/${${found[1]:-${f:h:t}}##*=}/${f:h:h:t} "$(<$f)" )
+		found=( $map/${${f:h:t}#*-}=*(N) )
+		clipboards+=( $mtime/${${found[1]:-${$:h:t}}##*=}/${${f:h:t}%-*} "$(<$f)" )
 	done
 }
 typeset -f -t scan

=== modified file 'xpra-skel/homedir/bin/start-xpra-for-container'
--- old/xpra-skel/homedir/bin/start-xpra-for-container	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/bin/start-xpra-for-container	2024-08-03 22:38:44 +0000
@@ -239,14 +239,14 @@
 
 write_sv_xclipring() {
   local selection=$1
-  local name=xclipring-$selection.$display
+  local name=xpra-xclipring-$selection.$display
   - sv_start $name
   - sv_el_script run \
-    "if { mkdir -p /run/xclipring/$selection/$display }" \
+    "if { mkdir -p /run/xpra/$selection-$display }" \
     "in-xpra $display /usr/local/bin/xclipring" \
     "-s ${selection:u}" \
     "-c 32" \
-    "-d /run/xclipring/$selection/$display"
+    "-d /run/xpra/$selection-$display"
   - sv_end
   client_services+=( $name )
 }

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/clipboard/5 }
-export DISPLAY :5 /usr/local/bin/xclipring
--s CLIPBOARD
--c 32
--d /run/xclipring/clipboard/5

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.5/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/clipboard/6 }
-export DISPLAY :6 /usr/local/bin/xclipring
--s CLIPBOARD
--c 32
--d /run/xclipring/clipboard/6

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.6/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/clipboard/7 }
-export DISPLAY :7 /usr/local/bin/xclipring
--s CLIPBOARD
--c 32
--d /run/xclipring/clipboard/7

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.7/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/clipboard/8 }
-export DISPLAY :8 /usr/local/bin/xclipring
--s CLIPBOARD
--c 32
--d /run/xclipring/clipboard/8

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-clipboard.8/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-primary.5'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.5/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.5/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.5/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/primary/5 }
-export DISPLAY :5 /usr/local/bin/xclipring
--s PRIMARY
--c 32
--d /run/xclipring/primary/5

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.5/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.5/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.5/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-primary.6'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.6/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.6/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.6/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/primary/6 }
-export DISPLAY :6 /usr/local/bin/xclipring
--s PRIMARY
--c 32
--d /run/xclipring/primary/6

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.6/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.6/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.6/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-primary.7'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.7/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.7/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.7/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/primary/7 }
-export DISPLAY :7 /usr/local/bin/xclipring
--s PRIMARY
--c 32
--d /run/xclipring/primary/7

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.7/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.7/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.7/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== removed directory 'xpra-skel/homedir/run/rc.extra/xclipring-primary.8'
=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.8/run'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.8/run	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.8/run	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-if { mkdir -p /run/xclipring/primary/8 }
-export DISPLAY :8 /usr/local/bin/xclipring
--s PRIMARY
--c 32
--d /run/xclipring/primary/8

=== removed file 'xpra-skel/homedir/run/rc.extra/xclipring-primary.8/type'
--- old/xpra-skel/homedir/run/rc.extra/xclipring-primary.8/type	2024-08-04 11:33:34 +0000
+++ new/xpra-skel/homedir/run/rc.extra/xclipring-primary.8/type	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-longrun

=== modified file 'xsession-skel/homedir/bin/x'
--- old/xsession-skel/homedir/bin/x	2024-08-04 11:33:34 +0000
+++ new/xsession-skel/homedir/bin/x	2024-05-07 20:36:32 +0000
@@ -8,8 +8,6 @@
   xsession_cookie="$(xauth list $DISPLAY)" || exit $?
   xsession_cookie=${xsession_cookie##* } || exit $?
   s6-sudo /run/cmd.s link xsession.$display.$USER xpra.$USER tmp/.X11-unix/X$display || exit $?
-  s6-sudo /run/inbox/xpra.$USER/run/exec/x11 "$display" "$xsession_cookie" s6-svc -o /run/service/xclipring-primary.$display
-  s6-sudo /run/inbox/xpra.$USER/run/exec/x11 "$display" "$xsession_cookie" s6-svc -o /run/service/xclipring-clipboard.$display
   exec s6-sudo /run/inbox/xpra.$USER/run/exec/x11 "$display" "$xsession_cookie" xkb-all
 }