=== modified file 'zsh-functions/confz_containers_init'
--- old/zsh-functions/confz_containers_init	2021-01-15 23:38:59 +0000
+++ new/zsh-functions/confz_containers_init	2021-01-15 23:28:30 +0000
@@ -92,12 +92,10 @@
 }
 
 confz_container_service_generic_check() {
-	local uid gid container_user_dir svc_dir container
+	local uid gid container_user_dir svc_dir
 	local -a fstab
 	checkvars containers_dir svscan_dir image_name user
 	defvar fstab_extra ''
-	defvar container_name "$vars[image_name]"
-	container=$vars[container_name]
 
 	uid="${${(s.:.)"$(getent passwd ccx)"}[3]}" \
 	gid="${${(s.:.)"$(getent group ccx)"}[3]}" \
@@ -106,7 +104,7 @@
 	require fs_m filename=$vars[containers_dir]/user/$vars[user] mode=751
 	require fs_o filename=$vars[containers_dir]/user/$vars[user] owner=0:$gid
 
-	container_user_dir=$vars[containers_dir]/user/$vars[user]/$container
+	container_user_dir=$vars[containers_dir]/user/$vars[user]/$vars[image_name]
 	require fs_d filename=$container_user_dir
 	require fs_m filename=$container_user_dir mode=751
 	require fs_o filename=$container_user_dir owner=0:$gid
@@ -126,19 +124,19 @@
 	require fs_m filename=$vars[containers_dir]/home/$vars[user] mode=751
 	require fs_o filename=$vars[containers_dir]/home/$vars[user] owner=0:$gid
 
-	require fs_l filename=$vars[containers_dir]/home/$vars[user]/$container \
-		destination=../../user/$vars[user]/$container/home/$vars[user]
+	require fs_l filename=$vars[containers_dir]/home/$vars[user]/$vars[image_name] \
+		destination=../../user/$vars[user]/$vars[image_name]/home/$vars[user]
 
 	fstab=(
 		$vars[containers_dir]/$vars[image_name]$'\t'$container_user_dir/root$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		$container_user_dir/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
-	svc_dir=$vars[svscan_dir]/container.$container.$vars[user]
+	svc_dir=$vars[svscan_dir]/container.$vars[image_name].$vars[user]
 	require container_service_preset preset=generic \
 		svc_dir=$svc_dir control_user=$uid control_group=$gid \
 		root_link=$container_user_dir/root \
@@ -147,15 +145,14 @@
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_USER \
 		content=$vars[user]
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_NAME \
-		content=$container
+		content=$vars[image_name]
 }
 
 confz_container_service_xsession_check() {
-	local uid gid container_user_dir svc_dir container
+	local uid gid container_user_dir svc_dir
 	local -a fstab
 	checkvars containers_dir svscan_dir image_name user display_number
 	defvar fstab_extra ''
-	container=xsession.$vars[display_number]
 
 	uid="${${(s.:.)"$(getent passwd ccx)"}[3]}" \
 	gid="${${(s.:.)"$(getent group ccx)"}[3]}" \
@@ -164,7 +161,7 @@
 	require fs_m filename=$vars[containers_dir]/user/$vars[user] mode=751
 	require fs_o filename=$vars[containers_dir]/user/$vars[user] owner=0:$gid
 
-	container_user_dir=$vars[containers_dir]/user/$vars[user]/$container
+	container_user_dir=$vars[containers_dir]/user/$vars[user]/$vars[image_name]
 	require fs_d filename=$container_user_dir
 	require fs_m filename=$container_user_dir mode=751
 	require fs_o filename=$container_user_dir owner=0:$gid
@@ -177,15 +174,15 @@
 	require fs_m filename=$vars[containers_dir]/home/$vars[user] mode=751
 	require fs_o filename=$vars[containers_dir]/home/$vars[user] owner=0:$gid
 
-	require fs_l filename=$vars[containers_dir]/home/$vars[user]/$container \
-		destination=../../user/$vars[user]/$container/root/home/$vars[user]
+	require fs_l filename=$vars[containers_dir]/home/$vars[user]/$vars[image_name] \
+		destination=../../user/$vars[user]/$vars[image_name]/root/home/$vars[user]
 
 	fstab=(
 		$vars[containers_dir]/$vars[image_name]$'\t'$container_user_dir/root$'\tnone\tbind,ro,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
@@ -198,7 +195,7 @@
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_USER \
 		content=$vars[user]
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_NAME \
-		content=$container_name
+		content=xsession.$vars[display_number]
 }
 
 # --- old