From 106904309f02f306b6483fc81a00556e53c623e9 Mon Sep 17 00:00:00 2001
From: Holger Paradies <retabell@gmx.de>
Date: Tue, 22 Dec 2015 12:46:34 +0100
Subject: remove lightdm hack
---
.../01-remove-gnome-icon-cache.chroot | 2 +-
config/chroot_local-hooks/03-lxde-fixes | 25 +++++++++++-----------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot b/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot
index 0c229d2..45190dd 100755
--- a/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot
+++ b/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot
@@ -6,7 +6,7 @@ set -e
# the hook is removed in upcoming lb-versions
# so i keep it here
-if [ -x /usr/sbin/lightdm ]; then
+if [ -x /usr/bin/lxde-logout ]; then
# only on i386
if ! [ -d /lib/x86_64-linux-gnu ]; then
diff --git a/config/chroot_local-hooks/03-lxde-fixes b/config/chroot_local-hooks/03-lxde-fixes
index 0ce1607..e94eb1b 100755
--- a/config/chroot_local-hooks/03-lxde-fixes
+++ b/config/chroot_local-hooks/03-lxde-fixes
@@ -1,15 +1,12 @@
#!/bin/sh
for file in /root/config/*; do [ -r $file ] && . $file; done
-if [ -x /usr/sbin/lightdm ]; then
+if [ -x /usr/bin/lxde-logout ]; then
# dirty hack kanotix wallpaper on login-screen
echo "background=/usr/share/images/kanotix-starrise/kanotix-starrise.png" >>/etc/lightdm/lightdm-gtk-greeter.conf
# enable display of users at login prompt
sed -i 's/^greeter-hide-users=true/greeter-hide-users=false/' /etc/lightdm/lightdm.conf
- # script is called by lightdm
- if [ -x /usr/sbin/kanotix-lightdm-display-setup-script ]; then
- sed -i 's/^#display-setup-script=/display-setup-script=\/usr\/sbin\/kanotix-lightdm-display-setup-script/' /etc/lightdm/lightdm.conf
- fi
+
# old kanotix icon in login
if [ "$LB_DISTRIBUTION" = "wheezy" ]; then
sed -i 's/computer/kanotix/' /usr/share/lightdm-gtk-greeter/greeter.ui
@@ -17,14 +14,16 @@ if [ -x /usr/sbin/lightdm ]; then
# Industrial conflicts
sed -i s/Industrial/Clearlooks-Phenix/ /etc/skel/.gtkrc-2.0
- # on lxde i386 delete packages to reduce image-size
- if [ "$LB_ARCHITECTURE" = "i386" ]; then
- apt-get purge --yes aptitude aptitude-common
- apt-get purge --yes vim vim-common vim-runtime
- if [ "$LB_DISTRIBUTION" = "wheezy" ]; then
- rm -rf /usr/lib/python3/dist-packages/devscripts
- apt-get purge --yes devscripts python3 python3-minimal python3.2 python3.2-minimal
- apt-get install --yes -t wheezy devscripts
+ # on lxde i386 wheezy delete packages to reduce image-size
+ if [ "$LB_DISTRIBUTION" = "wheezy" ]; then
+ if [ "$LB_ARCHITECTURE" = "i386" ]; then
+ apt-get purge --yes aptitude aptitude-common
+ apt-get purge --yes vim vim-common vim-runtime
+ if [ "$LB_DISTRIBUTION" = "wheezy" ]; then
+ rm -rf /usr/lib/python3/dist-packages/devscripts
+ apt-get purge --yes devscripts python3 python3-minimal python3.2 python3.2-minimal
+ apt-get install --yes -t wheezy devscripts
+ fi
fi
fi
--
cgit v1.0