From 2c382cd3c3dbb0e68362f60c591385b2ad85a91c Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 3 Aug 2017 17:13:23 +0200 Subject: [PATCH] Added Light display manager as build option: DISPLAY_MANAGER="yes" --- lib/configuration.sh | 2 +- lib/desktop.sh | 11 ++++++++++- packages/blobs/desktop/icons/armbian.png | Bin 0 -> 13918 bytes .../desktop/lightdm/lightdm-gtk-greeter.conf | 6 ++++++ .../lightdm/lightdm.conf.d/10-ubuntu.conf | 5 +++++ .../common/etc/profile.d/check_first_login.sh | 15 ++++++++++++++- 6 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 packages/blobs/desktop/icons/armbian.png create mode 100644 packages/blobs/desktop/lightdm/lightdm-gtk-greeter.conf create mode 100644 packages/blobs/desktop/lightdm/lightdm.conf.d/10-ubuntu.conf diff --git a/lib/configuration.sh b/lib/configuration.sh index 4033c659b0..cf429a2afe 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -116,7 +116,7 @@ PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools dosfstools hddtemp iotop iozone3 hdparm rfkill vlan sysstat bluez bluez-tools bash-completion hostapd git ethtool network-manager unzip ifenslave lirc \ libpam-systemd iperf3 software-properties-common libnss-myhostname f2fs-tools avahi-autoipd iputils-arping" -PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage thunar-volman galculator hexchat \ +PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit x11-xserver-utils xfce4 lxtask xterm mirage thunar-volman galculator hexchat \ gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu bluetooth \ network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 libgcr-3-common p11-kit pasystray pavucontrol pulseaudio \ paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv \ diff --git a/lib/desktop.sh b/lib/desktop.sh index c574131d28..f352861680 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -49,8 +49,17 @@ install_desktop () sed "s/load-module module-udev-detect$/& tsched=0/g" -i $SDCARD/etc/pulse/default.pa fi + # Choose display manager + if [[ $DISPLAY_MANAGER == yes ]]; then chroot $SDCARD /bin/bash -c "apt-get install -qq -y --no-install-recommends lightdm-gtk-greeter lightdm"; \ + else chroot $SDCARD /bin/bash -c "apt-get install -qq -y --no-install-recommends nodm"; fi + # Disable desktop mode autostart for now to enforce creation of normal user account - sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=false/g" -i $SDCARD/etc/default/nodm + [[ -f $SDCARD/etc/default/nodm ]] && sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=false/g" -i $SDCARD/etc/default/nodm + [[ -d $SDCARD/etc/lightdm ]] && chroot $SDCARD /bin/bash -c "systemctl disable lightdm.service >/dev/null 2>&1" + + # install logo for login screen + cp $SRC/packages/blobs/desktop/icons/armbian.png $SDCARD/usr/share/pixmaps + cp -R $SRC/packages/blobs/desktop/lightdm $SDCARD/etc # Compile Turbo Frame buffer for sunxi if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then diff --git a/packages/blobs/desktop/icons/armbian.png b/packages/blobs/desktop/icons/armbian.png new file mode 100644 index 0000000000000000000000000000000000000000..c644912cadd74a42c751bb6fe17477aa68fd57c8 GIT binary patch literal 13918 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 to abort" - [ -f "/etc/init.d/nodm" ] && echo "Desktop environment will not be enabled if you abort the new user creation" + [ -f "/etc/init.d/nodm" ] || [ -d "/etc/lightdm" ] && echo "Desktop environment will not be enabled if you abort the new user creation" trap check_abort INT while [ -f "/root/.not_logged_in_yet" ]; do add_user @@ -108,6 +108,19 @@ if [ -f /root/.not_logged_in_yet ] && [ -n "$BASH_VERSION" ] && [ "$-" != "${-#* sleep 1 service nodm start fi + elif [ -d "/etc/lightdm" ] && [ -n "$RealName" ] ; then + systemctl enable lightdm.service 2>/dev/null + if [[ -f /var/run/resize2fs-reboot ]]; then + # Let the user reboot now otherwise start desktop environment + printf "\n\n\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n" + printf "\e[0;91mPlease reboot the system now \x1B[0m \n\n" + elif [ -z "$ConfigureDisplay" ] || [ "$ConfigureDisplay" = "n" ] || [ "$ConfigureDisplay" = "N" ]; then + echo -e "\n\e[1m\e[39mNow starting desktop environment...\x1B[0m\n" + sleep 1 + service lightdm start 2>/dev/null + # logout if logged at console + [[ -n $(who -la | grep root | grep tty1) ]] && exit 1 + fi else # Display reboot recommendation if necessary if [[ -f /var/run/resize2fs-reboot ]]; then