Removing old code in chroot_hacks for tasks which are not used anymore.
This commit is contained in:
parent
9013f5d8db
commit
10d0fb5aed
|
@ -52,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 ]
|
||||
|
|
Loading…
Reference in New Issue