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_main12
1 files changed, 10 insertions, 2 deletions
diff --git a/backend/modules/install_main b/backend/modules/install_main
index a0363b6..381f2ae 100644
--- a/backend/modules/install_main
+++ b/backend/modules/install_main
@@ -285,7 +285,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
- cp -a /etc/locale.conf $TARGET/etc/locale.conf
+ 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
@@ -358,9 +360,15 @@ function copy_etc_to_target()
sed -i "s/User=kanotix/User=${cfg_username}/" $TARGET/etc/sddm.conf.d/kde_settings.conf
else
sed -i 's/User=kanotix/User=/' $TARGET/etc/sddm.conf.d/kde_settings.conf
- sed -i 's/Session=plasmax11/Session=/' $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