diff --git a/install/1merge/calculate-desktop/.calculate_directory b/install/1merge/calculate-desktop/.calculate_directory new file mode 100644 index 0000000..437bd6a --- /dev/null +++ b/install/1merge/calculate-desktop/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate belong()!=&&cl_chroot_status==off&&pkg(sys-apps/calculate-desktop)!= name=etc path=/usr name=bin + diff --git a/install/1merge/calculate-desktop/xautologin b/install/1merge/calculate-desktop/xautologin new file mode 100644 index 0000000..dfebe07 --- /dev/null +++ b/install/1merge/calculate-desktop/xautologin @@ -0,0 +1,8 @@ +# Calculate chown=0755 +#!/bin/bash +#?list(cl_migrate_user,1)!=# +export USER=#-list(cl_migrate_user,1)-# +/usr/share/calculate/xdm/xdm --login +su - #-list(cl_migrate_user,1)-# -c "/bin/bash -lc startx" +/usr/share/calculate/xdm/xdm --logout +#list# diff --git a/install/1merge/xorg-server/conf.d/xdm b/install/1merge/xorg-server/conf.d/xdm index eb21521..dfe6517 100644 --- a/install/1merge/xorg-server/conf.d/xdm +++ b/install/1merge/xorg-server/conf.d/xdm @@ -1,12 +1,15 @@ # Calculate comment=# CHECKVT=7 -#?pkg(kde-base/kdm)!=# +#?os_install_root_type==livecd||os_install_linux_shortname==CMC# +DISPLAYMANAGER="xautologin" +#os_install_root_type# +#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=# DISPLAYMANAGER="kdm" #pkg# -#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# +#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# DISPLAYMANAGER="gdm" #pkg# -#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# +#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# DISPLAYMANAGER="slim" #pkg#