diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
index 814561b10afaaca8784d3545a25d108bff317168..4f0698674321f4f55aa32ba2557c3df601670395 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
@@ -52,7 +52,8 @@ function install_libnsa()
function add_no_bootloader_icon()
{
mkdir -p "$IRD/lip/no-bootloader-icon"
- cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
+ cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-kdeui.desktop" "$IRD/lip/no-bootloader-icon/"
+ cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
cp "$SCRIPT_DIR/no-bootloader-icon/25adduser" "$IRD/scripts/casper-bottom/"
chmod +x "$IRD/scripts/casper-bottom/25adduser"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook
index 35a7f5ba96b372c70f2c30f9bdf9d213d90820ce..fa571c4fe255b060ad8312b8cd3aac812753adc0 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook
@@ -22,7 +22,8 @@ load_confmodule
log_begin_msg "$DESCRIPTION"
#copy desktop file for the no-bootloader-icon (required in 25adduser)
-cp /lip/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop /root/usr/share/applications/
+cp /lip/no-bootloader-icon/ubiquity-kdeui.desktop /root/usr/share/applications/kde4/
+cp /lip/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop /root/usr/share/applications/kde4/
#TODO: install ubiquity here?
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
index 09be46c72f9c41c9ec41e2bcb62ca85a132e75ff..b6f42ba36f1ea420be1c816448ee2352756da130 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
@@ -18,17 +18,15 @@
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/15autologin
[ -e /conf/param.conf ] && . /conf/param.conf
+/scripts/casper-bottom/16gdmnopasswd
+[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/18hostname
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/19keyboard
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/20xconfig
[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22gnome_panel_data
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22screensaver
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22serialtty
+/scripts/casper-bottom/22desktop_settings
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/22sslcert
[ -e /conf/param.conf ] && . /conf/param.conf
@@ -36,20 +34,20 @@
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/23networking
[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/24preseed
-[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/24liphook
[ -e /conf/param.conf ] && . /conf/param.conf
+/scripts/casper-bottom/24preeseed
+[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/25adduser
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/25configure_init
[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26disable_user_menu
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26mopsmops
+/scripts/casper-bottom/26serialtty
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/26libnsa
[ -e /conf/param.conf ] && . /conf/param.conf
+/scripts/casper-bottom/26mopsmops
+[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/30accessibility
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/31disable_update_notifier
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
index 012a9f5afbd2a0df56d702cbf5fe7766ae08d78b..0e6c1ffe16746b6dc5bf59d425ab90ba214e00d4 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
@@ -21,76 +21,7 @@ load_confmodule
log_begin_msg "$DESCRIPTION"
-LIBNSALOGO=$(cat <<EOF
-begin-base64 664 -
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYC0u
-YCcuLScKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-YC0uICAgICAgICAuLScuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgIGAtLiAgICAtLi9cLi0gICAgLi0nCiAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAtLiAgL198XCAgLi0KICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgYC0uICAgYC9fX19fXCcgICAu
-LScuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGAtLiAgICAt
-Li8uLSIiLS5cLi0gICAgICAnCiAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgIGAtLiAgLzwgKCgpKSA+XCAgLi0nCiAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAtICAgLmAvX19gLS4uLSdfX1wnICAgLi0K
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsLi4uYC0uL19fX3xf
-X19ffF9fX1wuLScuLC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAsLScgICAsYCAuIC4gJywgICBgLSwKICAgICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAsLScgICBfX19fX19fX19fX19fX19fICBgLSwKICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsJy9fX19ffF9fX19f
-fF9fX19fXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyAv
-X198X19fX198X19fX198X19fXAogICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAvIC98X19fX198X19fX198X19fX198X1wKICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAnIC9fX19ffF9fX19ffF9fX19ffF9fX19f
-XAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuJyAvX198X19fX198
-X19fX198X19fX198X19fXAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICwnIC98X19fX198X19fX198X19fX198X19fX198X1wKLCwtLS0nJy0tLi4u
-X19fLi4uLS0nJyctLS4uIC8uLi9fX19ffF9fX19ffF9fX19ffF9fX19ffF9f
-X19fXCAuLi0tYGBgLS0uLi5fX18uLi4tLWBgLS0tLCwKICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgJy4uL19ffF9fX19ffF9fX19ffF9fX19ffF9fX19f
-fF9fX1wKICAgICAgXCAgICApICAgICAgICAgICAgICAnLjovfF9fX19ffF9f
-X19ffF9fX19ffF9fX19ffF9fX19ffF9cICAgICAgICAgICAgICAgKCAgICAv
-CiAgICAgIClcICAvICkgICAgICAgICAgICwnOi4vX19fX3xfX19fX3xfX19f
-X3xfX19fX3xfX19fX3xfX19fX1wgICAgICAgICAgICAgKCBcICAvKAogICAg
-IC8gLyAoICggICAgICAgICAgIC86Li4vX198X19fX198X19fX198X19fX198
-X19fX198X19fX198X19fXCAgICAgICAgICAgICApICkgXCBcCiAgICB8IHwg
-ICBcIFwgICAgICAgICAvLi4uL3xfX19fX3xfX19fX3xfX19fX3xfX19fX3xf
-X19fX3xfX19fX3xfXCAgICAgICAgICAgLyAvICAgfCB8CiAuLS5cIFwgICAg
-XCBcICAgICAgICcuLjovX19fX3xfX19fX3xfX19fX3xfX19fX3xfX19fX3xf
-X19fX3xfX19fX1wgICAgICAgICAvIC8gICAgLyAvLi0uCig9ICApXCBgLl8u
-JyB8ICAgICAgIFw6Li8gXyAgXyBfX18gIF9fX18gX19fXyBfICAgIF8gXyBf
-IF8gXyAgXyBfX19cICAgICAgICB8IGAuXy4nIC8oICA9KQogXCAoXykgICAg
-ICAgKSAgICAgICBcLi8gIHxcL3wgfF9fKSB8X19fIHxfX18gfF9fXyBfWF8g
-X1hfICBcLyAgX3xfIFwgICAgICAgKCAgICAgICAoXykgLwogIFwgICAgYC0t
-LS0nICAgICAgICAgIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIi
-IiIiIiIiIiIiIiIiIiIiICAgICAgIGAtLS0tJyAgICAvCiAgIFwgICBfX19f
-XF9fICAgICAgICAgIF9fIF9fICAgIF8gIF9fIF8gICAgIF8gIF9fIF9fX19f
-X19fICAgIF9fX19fICAgICAgICBfXy9fX19fICAgLwogICAgXCAoPVwgICAg
-IFwgICAgICAgIChfIHxfIHxWfHxfKXxfIHxfKSAgIHxffChfIC8gICB8ICB8
-ICAgIHxfICB8ICAgICAgICAvICAgICAvLSkgLwogICAgIFxfKV9cICAgICBc
-ICAgICAgIF9fKXxfX3wgfHwgIHxfX3wgXCAgIHwgfF9fKVxfX198X198XyAg
-IHwgIF98XyAgICAgIC8gICAgIC9fKF8vCiAgICAgICAgICBcICAgICBcICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAvICAgICAvCiAgICAgICAgICAgKSAgICAgKSAgXyAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8gICgg
-ICAgICgKICAgICAgICAgICggICAgICgsLScgYC0uLl9fICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgX18uLi0nIGAtLCkgICAgICkKICAg
-ICAgICAgICBcXy4tJycgICAgICAgICAgYGAtLi5fX19fICAgICAgICAgICAg
-ICAgICAgX19fXy4uLScnICAgICAgICAgIGBgLS5fLwogICAgICAgICAgICBg
-LS5fICAgICAgICAgICAgICAgICAgICBgYC0tLi4uX19fXy4uLi0tJycgICAg
-ICAgICAgICAgICAgICAgIF8uLScKICAgICAgICAgICAgICAgIGAtLi5fICAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-Xy4uLScKICAgICAgICAgICAgICAgICAgICAgYC0uLl9fICAgICAgICAgIEFM
-VC5BU0NJSS1BUlQgICAgICAgICAgICAgX18uLi0nCiAgICAgICAgICAgICAg
-ICAgICAgICAgICAgIGBgLS4uX19fXyAgICAgICAgICAgICAgICAgIF9fX18u
-Li0nJwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBgYC0t
-Li4uX19fXy4uLi0tJycKTUpQCg==
-====
-EOF)
-
-echo $LIBNSALOGO | busybox uudecode
-
-# Starting nmtelekinese with the MoPS network
+# Install libnsa
cp /lip/libnsa/libnsa.sh /root/usr/bin/
chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
cp /lip/libnsa/libnsa.desktop /root/home/${USERNAME}/.config/autostart
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser
index 555cecffa2e79db48967f49e2681130269496827..0462c5f5c608559fdb5386ed8d2b423594e97f20 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser
@@ -69,19 +69,16 @@ debconf_restore \
passwd/user-password passwd/user-password-again \
passwd/user-fullname passwd/username passwd/user-uid
-if [ -f /root/etc/sudoers ]; then
- echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+if [ -d /root/etc/sudoers.d/ ]; then
+ echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" > /root/etc/sudoers.d/casper
fi
-# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
LTS="$(cut -d' ' -f3 /root/cdrom/.disk/info 2>/dev/null)" || LTS=
-RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null)" || RELEASE=
+RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null | sed 's/-/ /')" || RELEASE=
if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
RELEASE="$RELEASE LTS"
fi
-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/ubiquity-gtkui-no-bootloader.desktop; do
+for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop /usr/share/applications/kde4/ubiquity-kdeui-no-bootloader.desktop; do
if [ -f "/root/$file" ]; then
sed -i "s/RELEASE/$RELEASE/" "/root$file"
chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
@@ -99,25 +96,30 @@ if [ -f /root/home/$USERNAME/examples.desktop ]; then
mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
fi
+#GDM
+if [ -d /root/etc/gdm ]; then
+ sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
+fi
+
#Kubuntu
-if [ -f "/root/usr/bin/plasma" ]; then
- if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop" ]; then
+if [ -f "/root/usr/bin/plasma-desktop" ]; then
+ if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
- chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop /home/$USERNAME/Desktop/about-kubuntu.desktop
+ chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop /home/$USERNAME/Desktop/a_welcome.desktop
fi
fi
#Ubuntu MID wants to be installed with --automatic
if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
- if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then
- sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity-gtkui.desktop"
+ if [ -f "/root/usr/share/applications/ubiquity.desktop" ]; then
+ sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity.desktop"
fi
fi
#Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
if [ -f "/root/etc/xdg/menus/home.menu" ]; then
- sed -i '/<\/Include>/i\ <Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
+ sed -i '/<\/Include>/i\ <Filename>ubiquity.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
fi
fi
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui-no-bootloader.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui-no-bootloader.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..134d86f67dcae995c8c4a679e526776e54b95513
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui-no-bootloader.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+# Do not translate the word "Kubuntu 13.10". It is used as a marker by casper.
+Name=Install Kubuntu 13.10 (No Bootloader)
+Comment=Install this system permanently to your hard disk
+Keywords=ubiquity;
+Exec=ubiquity kde_ui --no-bootloader
+Icon=ubiquity-kde
+Terminal=false
+Categories=KDE;Qt;System;
+OnlyShowIn=KDE;
+X-Ubuntu-Gettext-Domain=ubiquity-desktop
\ No newline at end of file
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..9a5940ca692a77e4df816108de644cf3f49513e0
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+# Do not translate the word "Kubuntu 13.10". It is used as a marker by casper.
+Name=Install Kubuntu 13.10
+Comment=Install this system permanently to your hard disk
+Keywords=ubiquity;
+Exec=ubiquity kde_ui
+Icon=ubiquity-kde
+Terminal=false
+Categories=KDE;Qt;System;
+OnlyShowIn=KDE;
+X-Ubuntu-Gettext-Domain=ubiquity-desktop
\ No newline at end of file