Improve autologin.

install/1live/00-calculate-install/calculate2.env

@@ -6,3 +6,9 @@
 
 [install]
 os_install_net_settings = #-os_install_net_conf-#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC#
+cl_autologin = #-cl_autologin-#
+#cl_autologin#
+#?cl_autologin==&&os_install_linux_shortname==CMC#
+cl_autologin =
+#cl_autologin#

install/1live/xorg-server/conf.d/xdm

@@ -1,25 +1,20 @@
 # Calculate comment=#
 
 CHECKVT=7
-#?os_install_root_type==livecd&&list(cl_migrate_user,1)!=||os_install_linux_shortname==CMC&&list(cl_migrate_user,1)!=#
-XUSER=#-list(cl_migrate_user,1)-#
-#os_install_root_type#
-#?os_install_root_type==livecd&&list(cl_migrate_user,1)==||os_install_linux_shortname==CMC&&list(cl_migrate_user,1)==#
-XUSER=guest
-#os_install_root_type#
-#?os_install_root_type==livecd||os_install_linux_shortname==CMC#
+#?cl_autologin!=#
+XUSER=#-cl_autologin-#
 DISPLAYMANAGER="bash"
 START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT"
-#os_install_root_type#
-#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=#
+#cl_autologin#
+#?cl_autologin==&&pkg(kde-base/kdm)!=#
 DISPLAYMANAGER="kdm"
 START_STOP_ARGS=
-#os_install_root_type#
-#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
+#cl_autologin#
+#?cl_autologin==&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
 DISPLAYMANAGER="gdm"
 START_STOP_ARGS=
-#os_install_root_type#
-#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
+#cl_autologin#
+#?cl_autologin==&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
 DISPLAYMANAGER="slim"
 START_STOP_ARGS=
-#os_install_root_type#
+#cl_autologin#

install/1system/calculate-install/calculate2.env

@@ -10,6 +10,12 @@ os_install_ntp = #-os_install_ntp-#
 # name of net manager which is used
 os_install_net_settings = #-os_install_net_conf-#
 #pkg#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+cl_autologin = #-cl_autologin-#
+#cl_autologin#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+cl_autologin =
+#cl_autologin#
 
 #?os_install_linux_ver>10.8.81#
 [main]