=== modified file 'home/xsession-setup'
--- old/home/xsession-setup	2021-01-20 13:54:47 +0000
+++ new/home/xsession-setup	2019-06-28 17:18:05 +0000
@@ -5,11 +5,6 @@
 DSTROOT=$1
 DISPLAYNUM=$2
 
-# make files that can't be easily version-controlled
-setup-special() {
-	mkfifo $DSTROOT/run/plumber_fifo || exit $?
-}
-
 copy-skel() {
 	local skel
 	for skel in $HOME/xsession-skel/*/*(DN); do
@@ -44,7 +39,6 @@
 	fi
 
 	copy-skel
-	setup-special
 	setup-x11
 	setup-i3status
 }

=== modified file 'xsession-skel/home/ccx/bin/powerbox-plumb'
--- old/xsession-skel/home/ccx/bin/powerbox-plumb	2021-01-20 13:54:47 +0000
+++ new/xsession-skel/home/ccx/bin/powerbox-plumb	2021-01-07 14:25:02 +0000
@@ -1,6 +1,2 @@
 #!/bin/sh
-if ! [[ -p /run/plumber_fifo ]]; then
-	echo >&2 "/run/plumber_fifo does not exist or is not a pipe"
-	exit 1
-fi
 exec fakeplumb >/run/plumber_fifo "$@"

=== modified file 'xsession-skel/home/ccx/bin/run-in-container-xpra'
--- old/xsession-skel/home/ccx/bin/run-in-container-xpra	2021-01-20 13:54:47 +0000
+++ new/xsession-skel/home/ccx/bin/run-in-container-xpra	2021-01-07 14:25:02 +0000
@@ -35,8 +35,6 @@
   display=${${running[1]:t}%%=*}
 fi
 
-signal_svscan
-
 typeset -gA svc_extra
 mksvcdir(){
   local name tmpsv f data
@@ -50,22 +48,14 @@
   chmod +x $tmpsv/run || exit $?
   svc_extra=( )
   mv $tmpsv /run/service/ || exit $?
-  (( signal_svscan++ ))
-  return 0
+  s6-svscanctl -a /run/service || exit $?
 }
 
-if ! [[ -d /run/service/xpra-xorg.$display ]]; then
-  mkdir -p /run/service/xpra-xorg.$display/{env,data} || exit $?
-  echo 3 >/run/service/xpra-xorg.$display/notification-fd || exit $?
-  ln -s -f ${commands[service.xpra-xorg.run]} /run/service/xpra-xorg.$display/run | exit $?
-  (( signal_svscan++ ))
-fi
-
 if ! [[ -d /run/service/xpra-server.$display ]]; then
   mksvcdir xpra-server.$display \
     '#!/bin/execlineb -P' \
     xpra-server $display --displayfd=3
-  echo 3 >/run/service/xpra-server.$display/notification-fd || exit $?
+  echo 3 >/run/service/xpra-server.$display/notification-fd
 fi
 
 if ! [[ -d /run/service/xpra-client.$display ]]; then
@@ -75,10 +65,6 @@
     "--title=\"[${container}:${display}] @title@ wid:@windowid@\""
 fi
 
-if ((signal_svscan)); then
-  s6-svscanctl -a /run/service || exit $?
-fi
-
 zsystem flock -u $lockfd
 
 s6-svc -wU -T 5000 -o /run/service/xpra-server.$display || exit $?

=== modified file 'xsession-skel/home/ccx/bin/xpra-server'
--- old/xsession-skel/home/ccx/bin/xpra-server	2021-01-20 13:54:47 +0000
+++ new/xsession-skel/home/ccx/bin/xpra-server	2021-01-07 14:25:02 +0000
@@ -33,7 +33,6 @@
 	--dbus-proxy=no
 	--dbus-control=no
 	--forward-xdg-open=False
-	#--xvfb="$server"
-	--xvfb="xpra-launch-xorg /run/service/xpra-xorg.$xpra_display"
+	--xvfb="$server"
 )
 exec xpra start "$args[@]" "$@" :$xpra_display

=== modified file 'xsession-skel/home/ccx/run/init'
--- old/xsession-skel/home/ccx/run/init	2021-01-20 13:54:47 +0000
+++ new/xsession-skel/home/ccx/run/init	2021-01-11 01:57:48 +0000
@@ -8,20 +8,16 @@
 foreground { uname -n }
 s6-envdir -I -- "/home/ccx/run/"/env
 redirfd -r 0 /dev/null
-if {
-  if -n { test -p /run/service/s6-svscan-log/fifo }
-  mkfifo /run/service/s6-svscan-log/fifo
-}
-redirfd -wnb 1 /run/service/s6-svscan-log/fifo
+if { mkfifo "/run"/service/s6-svscan-log/fifo }
+redirfd -wnb 1 "/run"/service/s6-svscan-log/fifo
 background
 {
   s6-setsid --
-  redirfd -w 1 /run/service/s6-svscan-log/fifo
-  fdmove -c 2 1
-  /home/ccx/run/rc.init
+  redirfd -w 1 "/run"/service/s6-svscan-log/fifo
+  fdmove -c 1 2
+  "/home/ccx/run/rc.init"
 }
 unexport !
-cd /run/service
+cd "/run"/service
 fdmove -c 2 1
-fdclose 3  # notification-fd
 s6-svscan -st0

=== modified file 'xsession-skel/home/ccx/run/rc.init'
--- old/xsession-skel/home/ccx/run/rc.init	2021-01-20 13:54:47 +0000
+++ new/xsession-skel/home/ccx/run/rc.init	2019-05-30 00:37:48 +0000
@@ -12,8 +12,5 @@
 # Call it twice because the first time may spuriously "timeout"
 # due to the clock jumping forward.
 
-#if -nt { s6-rc -t 600000 -- change ok-all }
-foreground { s6-rc -v 2 -t 600000 -- change ok-all }
-
-# notification-fd
-fdmove 1 3 echo
+if -nt { s6-rc -t 600000 -- change ok-all }
+s6-rc -t 600000 -- change ok-all