ported to 66 v0.2.1.0, use @I into file to be consistent with instance...

ported to 66 v0.2.1.0, use @I into file to be consistent with instance name,use @M instead of @MOD@ to prepare the transition to C

module/boot-user-@/All-@MOD@

-[main]
-@type = bundle
-@name = All-@MOD@
-@description = "First service called to start a scandir for @MOD@ user"
-@user = (root)
-@contents = ( mount-run-@MOD@ setenv-@MOD@ scandir-@MOD@ )

module/boot-user-@/.configure/help → module/boot-user@/.configure/help

 Modules name:
-	- boot-user-@
+	- boot-user@
 Version: 
-	- 0.1.0
+	- 0.2.0
 Description: 
 	- This module configure a set of services for an <user> to properly 
 	deal with Display Manager(a.k.a DM).
@@ -26,13 +26,13 @@ Optional package dependencies:
 
 Installation directive:
 
-	# 66-mods.sh boot-user-@<user>
-	# 66-enable boot-user-<user>
+	# 66-mods.sh boot-user@<user>
+	# 66-enable boot-user@<user>
 	
-	- Dbus and dbus-session-@: 
+	- Dbus and dbus-session@: 
 		- dbus daemon should be enabled and up before
 		starting the module on a root tree.
-		- dbus-session-<user> should be enabled on a <user> tree. 
+		- dbus-session@<user> should be enabled on a <user> tree. 
 		It will be brought up at the start of the session. 
 	
 	Note: .xinitrc file execute an JWM session by default. Edit it 
@@ -60,7 +60,7 @@ Runtime:
 	- It create a scandir as <user> as owner merging the environment from
 	the directory ${HOME}/.66/conf/boot-user/ and start it.
 
-Example of ${HOME}/.66/conf/boot-user/boot-user-<user>.conf file:
+Example of ${HOME}/.66/conf/boot-user/boot-user@<user>.conf file:
 
 HOME=/home/oblive
 LOGNAME=obarun

module/boot-user@/All-@M

+[main]
+@type = bundle
+@description = "First service called to start a scandir for @I user"
+@user = (root)
+@contents = ( mount-run-@I setenv-@I scandir-@I )

module/boot-user-@/env-@MOD@/setenv-@MOD@ → module/boot-user@/env-@M/setenv-@M

 [main]
 @type = oneshot
-@name = setenv-@MOD@
-@description = "Set well-know variable for @MOD@ user"
+@description = "Set well-know variable for @I user"
 @user = (root)
 
 [start]
 @build = auto
-@runas = @MOD@
+@runas = @I
 @execute = 
 (
 	execl-subuidgid
-	backtick -n HOME { homeof @MOD@ }
+	backtick -n HOME { homeof @I }
 	importas -u HOME HOME
 	foreground
 	{
 		if -nt { test -d ${HOME}/.66/conf/boot-user }
 		mkdir -p ${HOME}/.66/conf/boot-user
 	}
-	redirfd -w 1 ${HOME}/.66/conf/boot-user/boot-user-@MOD@.conf
+	redirfd -w 1 ${HOME}/.66/conf/boot-user/boot-user@@I.conf
 
 	## GENERAL VARIABLES
 
 	if { 66-echo HOME=${HOME} }
-	if { 66-echo LOGNAME=@MOD@ }
-	if { 66-echo USER=@MOD@ }
+	if { 66-echo LOGNAME=@I }
+	if { 66-echo USER=@I }
 
 	foreground { 
 		importas PATH PATH 

module/boot-user-@/mount-@MOD@/mount-run-@MOD@ → module/boot-user@/mount-@M/mount-run-@M

 [main]
 @type = oneshot
-@name = mount-run-@MOD@
-@description = "Mount /run/user directory of @MOD@"
+@description = "Mount /run/user directory of @I"
 @user = (root)
 
 [start]
@@ -9,7 +8,7 @@
 @execute = 
 (
 	## create /run/user/<uid>
-	execl-subuidgid -o @MOD@
+	execl-subuidgid -o @I
 	foreground {
 		if -nt { mountpoint -q /run/user/${UID} }
 		if { mkdir -p /run/user/${UID} }

module/boot-user-@/scandir-@MOD@ → module/boot-user@/scandir-@M

 [main]
 @type = longrun
-@name = scandir-@MOD@
-@description = "Start a scandir for @MOD@"
+@description = "Start a scandir for @I"
 @user = ( root )
 @options = ( log )
-@depends = ( mount-run-@MOD@ setenv-@MOD@ )
+@depends = ( mount-run-@I setenv-@I )
 @notify = 3
 @timeout-up = 3000
 
 [start]
 @build = auto
-@runas = @MOD@
+@runas = @I
 @execute =
 (
 s6-setsid -qb --
 umask 022
-66-scandir -v3 -d3 -cu -e /home/@MOD@/.66/conf/boot-user
+66-scandir -v3 -d3 -cu -e /home/@I/.66/conf/boot-user
 )