Merge branch 'lightdm.conf.d' into dev

Author: Hayao0819

build.sh

@@ -964,7 +964,7 @@ make_tarball() {
     if [[ -f "${work_dir}/airootfs/root/optimize_for_tarball.sh" ]]; then
         chmod 755 "${work_dir}/airootfs/root/optimize_for_tarball.sh"
         # Execute optimize_for_tarball.sh.
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "/root/optimize_for_tarball.sh" run
+        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "/root/optimize_for_tarball.sh -u ${username}" run
     fi
 
     ARCHISO_GNUPG_FD=${gpg_key:+17} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "mkinitcpio -p ${kernel_mkinitcpio_profile}" run

channels/basic/airootfs.any/root/optimize_for_tarball.sh

@@ -0,0 +1,4 @@
+[Seat:*]
+autologin-user=%USERNAME%
+autologin-user-timeout=0
+autologin-session=cinnamon2d

channels/cinnamon/airootfs.any/etc/lightdm/lightdm.conf.d/02-autologin.conf

@@ -15,7 +15,7 @@ else
 fi
 
 # Replace auto login user
-sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf
+sed -i "s|%USERNAME%|${username}|g" "/etc/lightdm/lightdm.conf.d/02-autologin.conf"
 
 # Replace password for screensaver comment
 sed -i s/%PASSWORD%/${password}/g "/etc/dconf/db/local.d/02-disable-lock"

channels/cinnamon/airootfs.any/root/customize_airootfs_cinnamon.sh

@@ -0,0 +1,2 @@
+[Seat:*]
+greeter-session=lightdm-slick-greeter