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

Updating hacks to cope with gdm and gdm3 packages.

This commit is contained in:
Daniel Baumann 2010-07-08 02:14:09 +02:00
parent 4223b8612f
commit 29bc7efdd9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
helpers/chroot_hacks
View File

@ -40,17 +40,27 @@ Create_lockfile .lock
# Handling default desktop configuration # Handling default desktop configuration
for TASK in ${LH_TASKS} for TASK in ${LH_TASKS}
do do
case "${LH_DISTRIBUTION}" in
lenny)
GDM="gdm"
;;
*)
GDM="gdm3"
;;
esac
case "${TASK}" in case "${TASK}" in
gnome-desktop) gnome-desktop)
# gnome is the only desktop environment in this image # gnome is the only desktop environment in this image
if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ] if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
then then
# set display manager # set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed" Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm" Chroot chroot "dpkg-reconfigure ${GDM}"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
# set session manager # set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session" Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
@ -81,11 +91,11 @@ do
if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ] if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then then
# set display manager # set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed" Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm" Chroot chroot "dpkg-reconfigure ${GDM}"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
# set session manager # set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde" Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
@ -97,11 +107,11 @@ do
if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ] if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
then then
# set display manager # set display manager
echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
Chroot chroot "debconf-set-selections /root/preseed" Chroot chroot "debconf-set-selections /root/preseed"
rm -f chroot/root/preseed rm -f chroot/root/preseed
Chroot chroot "dpkg-reconfigure gdm" Chroot chroot "dpkg-reconfigure ${GDM}"
echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
# set session manager # set session manager
Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session" Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"