diff options
| -rw-r--r-- | backend/modules/install_main | 12 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | kanotix/html/welcome.html | 4 | ||||
| -rw-r--r-- | kanotix/html/willkommen.html | 4 |
4 files changed, 21 insertions, 6 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 diff --git a/debian/changelog b/debian/changelog index d5c5240..c79d95f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +acritoxinstaller (0.2.57) unstable; urgency=medium + + * Support for sddm + * Small fixes for welcome message + + -- Holger Paradies <retabell@gmx.de> Sat, 03 May 2025 09:26:58 +0200 + acritoxinstaller (0.2.55) unstable; urgency=medium * Remove installer repo in installation. diff --git a/kanotix/html/welcome.html b/kanotix/html/welcome.html index 4711f8f..926345a 100644 --- a/kanotix/html/welcome.html +++ b/kanotix/html/welcome.html @@ -15,8 +15,8 @@ <p>Welcome and thank you for choosing Kanotix. The installer will now guide you through the configuration and installation.</p> <p>If you need any help check out the Kanotix website or visit the Kanotix chat room.</p> <ul> -<li><a href="https://kanotix.com">http://kanotix.com</a></li> -<li><a href="https://kanotix.acritox.com">http://kanotix.acritox.com</a></li> +<li><a href="https://kanotix.com">https://kanotix.com</a></li> +<li><a href="https://kanotix.acritox.com">https://kanotix.acritox.com</a></li> <li><a href="irc://irc.oftc.net/kanotix">irc: irc.oftc.net #kanotix</a></li> </ul> <p style="color:red;">Pay attention with UEFI Installation...</p> diff --git a/kanotix/html/willkommen.html b/kanotix/html/willkommen.html index 272db0c..cfad8ca 100644 --- a/kanotix/html/willkommen.html +++ b/kanotix/html/willkommen.html @@ -15,8 +15,8 @@ <p>Herzlich Willkommen und vielen Dank, dass Sie Kanotix gewählt haben. Der Installer wird Sie nun durch die Konfiguration und Installation führen.</p> <p>Falls Sie Hilfe benötigen werfen Sie einen Blick auf die Kanotix-Webseite oder besuchen Sie den Kanotix Chatroom.</p> <ul> -<li><a href="https://kanotix.com">http://kanotix.com</a></li> -<li><a href="https://kanotix.acritox.com">http://kanotix.acritox.com</a></li> +<li><a href="https://kanotix.com">https://kanotix.com</a></li> +<li><a href="https://kanotix.acritox.com">https://kanotix.acritox.com</a></li> <li><a href="irc://irc.oftc.net/kanotix">irc: irc.oftc.net #kanotix</a></li> </ul> <p style="color:red;">Besonderheiten bei UEFI Installation beachten...</p> |