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

Removing old code in chroot_hacks for tasks which are not used anymore.

This commit is contained in:
Daniel Baumann 2012-12-16 23:43:48 +01:00
parent 654c867490
commit f2d57e26ed
1 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
scripts/build/chroot_hacks
View File

@ -38,22 +38,6 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
case "${LB_PARENT_DISTRIBUTION}" in
squeeze)
if echo "${LB_TASKS}" | grep -qs lxde ||
echo "${LB_TASKS}" | grep -qs xfce
then
GDM="gdm"
else
GDM="gdm3"
fi
;;
*)
GDM="gdm3"
;;
esac
# Handling default desktop configuration
case "${LB_MODE}" in
debian*)
@ -68,78 +52,6 @@ case "${LB_MODE}" in
;;
esac
for TASK in ${LB_TASKS}
do
case "${TASK}" in
gnome-desktop)
# gnome is the only desktop environment in this image
if [ -z "$(echo ${LB_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 ${LB_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"
# get rid of resolvconf
Chroot chroot "dpkg -P resolvconf"
fi
;;
lxde-desktop)
# lxde is the only desktop environment in this image
if [ -z "$(echo ${LB_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 ${LB_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
case "${LB_BINARY_IMAGES}" in
netboot)
if [ ! -f chroot/sbin/mount.cifs ]