manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating default desktop configuration quirks.

This commit is contained in:
Daniel Baumann 2010-02-21 10:36:00 +01:00
parent 6e9125e463
commit 365a757bf5
3 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
helpers/chroot_hacks
View File

@ -37,6 +37,76 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
# Handling default desktop configuration
for TASK in ${LH_TASKS}
do
case "${TASKS}" in
gnome-desktop)
# gnome is the only desktop environment in this image
if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
# set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
fi
;;
kde-desktop)
# kde is the only desktop-environment in this image
if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure kdm"
echo "/usr/bin/kdm" > chroot/etc/X11/default-display-manager
# set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startkde"
fi
;;
lxde-desktop)
# lxde is the only desktop environment in this image
if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
# set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
fi
;;
xfce-desktop)
# xfce is the only desktop environment in this image
if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
# set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
fi
;;
esac
done
# Removing udev mac caching rule # Removing udev mac caching rule
rm -f chroot/etc/udev/rules.d/*persistent-net.rules rm -f chroot/etc/udev/rules.d/*persistent-net.rules

6
helpers/chroot_hooks
View File

@ -42,12 +42,6 @@ HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' |
for HOOK in ${HOOKS} for HOOK in ${HOOKS}
do do
# Special handling for kde
if [ "${HOOK}" = "kde-desktop" ] && [ -n "$(echo ${HOOKS} | grep gnome-desktop)" ]
then
continue
fi
if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ] if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
then then
# Copying hook # Copying hook

14
hooks/kde-desktop
View File

@ -1,14 +0,0 @@
#!/bin/sh
# /usr/share/live-helper/hooks/kde-desktop - hook list for live-helper(7)
# Copyright (C) 2006-2009 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
# This is free software, and you are welcome to redistribute it
# under certain conditions; see COPYING for details.
set -e
apt-get remove --purge --yes gdm
update-alternatives --set x-session-manager /usr/bin/startkde
dpkg-reconfigure kdm