Adding upstream version 1.99.1.

[live-boot-grml.git] / scripts / live-bottom / 10adduser

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index f4c42f8..0f28def 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -26,7 +26,7 @@ log_begin_msg "Adding live session user..."
 
 # live-initramfs script
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
     user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
 else
     user_crypted="U6aMy0wojraho" # "ubuntu"
@@ -34,6 +34,7 @@ fi
 
 # U6aMy0wojraho is just a blank password
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set passwd/make-user true
 set passwd/root-password-crypted *
 set passwd/user-password-crypted ${user_crypted}
 set passwd/user-fullname $USERFULLNAME
@@ -41,7 +42,7 @@ set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
     chroot /root /usr/bin/env -i HOME="/root" \
         TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
         /usr/lib/user-setup/user-setup-apply > /dev/null
@@ -51,6 +52,7 @@ fi
 
 # Clear out debconf database again to avoid confusing ubiquity later.
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set passwd/make-user
 set passwd/root-password-crypted
 set passwd/user-password-crypted
 set passwd/user-fullname
@@ -62,7 +64,7 @@ if [ -z "${NOSUDO}" ]
 then
 
 if [ -f /root/etc/sudoers ]; then
-    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
         grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
 
        # XXX - awful hack to stop xscreensaver locking the screen (#7150)
@@ -106,4 +108,8 @@ if [ -L /root/home/$USERNAME/Examples ]; then
     mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
 fi
 
+if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]; then
+    chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/$USERNAME/Desktop/about-kubuntu.desktop
+fi
+
 log_end_msg