← Back to branch summary

~ubuntu-branches/ubuntu/trusty/edubuntu-live/trusty

« back to all changes in this revision

Viewing changes to livecd/ubiquity/target-config/60edubuntu-default-session

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2013-03-13 11:14:11 UTC
  • mfrom: (108.1.6 edubuntu-live)
  • Revision ID: package-import@ubuntu.com-20130313111411-7gzupl8kqrlf1o8v
Tags: 13.03.1
https://launchpad.net/bugs/1154601
Revert to pre-raring version of the plugins and templates as
edubuntu-server isn't quite there yet.
The code is identical to that in Edubuntu 12.10 with the exception of
/ltsp/i386.img being changed to /casper/ltsp.squashfs.
(LP: #1154601)

Show diffs side-by-side

added added

removed removed

Lines of Context:
livecd/ubiquity/target-config/60edubuntu-default-session
1
1
#!/bin/sh
 
2
 
2
3
. /usr/share/debconf/confmodule
3
4
 
4
 
# Get desktop session
5
 
db_get ubiquity/edu-packages_desktop
6
 
DESKTOP="$RET"
 
5
db_get ubiquity/edubuntu-addon_fallback_install
 
6
INSTALL="$RET"
7
7
 
8
 
if [ -x /target/usr/lib/lightdm/lightdm-set-defaults ]; then
9
 
    chroot /target /usr/lib/lightdm/lightdm-set-defaults \
10
 
                                        --session $DESKTOP || true
 
8
if [ "$INSTALL" = "true" ]; then
 
9
    if [ -x /target/usr/lib/gdm/gdm-set-default-session ]; then
 
10
        chroot /target /usr/lib/gdm/gdm-set-default-session gnome-fallback || true
 
11
    elif [ -x /target/usr/lib/lightdm/lightdm-set-defaults ]; then
 
12
        chroot /target /usr/lib/lightdm/lightdm-set-defaults --session gnome-fallback || true
 
13
    fi
11
14
fi