summaryrefslogtreecommitdiff
path: root/backend/modules/install_main
diff options
context:
space:
mode:
Diffstat (limited to 'backend/modules/install_main')
-rw-r--r--backend/modules/install_main23
1 files changed, 23 insertions, 0 deletions
diff --git a/backend/modules/install_main b/backend/modules/install_main
index 723016d..d3b774a 100644
--- a/backend/modules/install_main
+++ b/backend/modules/install_main
@@ -172,6 +172,8 @@ EOF
printf "%-15s %-15s %-7s %-15s %-7s %s\n" "/dev${f#/sys/block}" "/media/floppy${f#/sys/block/fd}" "auto" "rw,user,noauto" "0" "0" >> $TARGET/etc/fstab
done
+# set restricted efi permission
+sed -i '/\/boot\/efi/s/umask=000,shortname=mixed,quiet,utf8 0 0/umask=0077 0 1/' $TARGET/etc/fstab
}
# Synopsis: update_passwd_on_target
@@ -285,6 +287,9 @@ function copy_etc_to_target()
cp -a /etc/localtime $TARGET/etc/localtime
cp -a /etc/default/keyboard $TARGET/etc/default/keyboard
cp -a /etc/default/locale $TARGET/etc/default/locale
+ if [ -e /etc/locale.conf ]; then
+ cp -a /etc/locale.conf $TARGET/etc/locale.conf
+ fi
cp -a /etc/locale.gen $TARGET/etc/locale.gen
cp -a /etc/apt/sources.list.d/*.list $TARGET/etc/apt/sources.list.d/
cp -a /etc/machine-id $TARGET/etc/machine-id
@@ -350,6 +355,24 @@ function copy_etc_to_target()
$TARGET/etc/lightdm/lightdm.conf
fi
+ # SDDM: auto login
+ # kde_settings.conf is written by kde-config-sddm so we provide this file in live-build
+ if [ -e $TARGET/etc/sddm.conf.d/kde_settings.conf ]; then
+ if [ "$cfg_autologin" = "on" ]; then
+ sed -i "s/User=kanotix/User=${cfg_username}/" $TARGET/etc/sddm.conf.d/kde_settings.conf
+ grep -q 'kwayland' /proc/cmdline && sed -i "s/Session=plasmax11/Session=plasma/" $TARGET/etc/sddm.conf.d/kde_settings.conf
+ else
+ sed -i 's/User=kanotix/User=/' $TARGET/etc/sddm.conf.d/kde_settings.conf
+ fi
+ fi
+ if [ -e /var/lib/sddm/state.conf ]; then
+ mkdir $TARGET/var/lib/sddm
+ chroot_it chown sddm:sddm /var/lib/sddm &>/dev/null
+ cp -a /var/lib/sddm/state.conf $TARGET/var/lib/sddm/state.conf
+ sed -i "s/User=kanotix/User=${cfg_username}/" $TARGET/var/lib/sddm/state.conf
+ fi
+
+
# Crypto
cp -a /etc/crypttab $TARGET/etc/crypttab