← Back to branch summary

~dpniel/ubiquity/fix-1479064

« back to all changes in this revision

Viewing changes to scripts/start-ubiquity-dm

  • Committer: Martin Pitt
  • Date: 2015-04-20 15:33:58 UTC
  • Revision ID: martin.pitt@canonical.com-20150420153358-ief8t01rw1yzqy5a
Stop running ubiquity.service as an oneshot service, as this blocks the
initial boot transaction (including ureadahead etc.). Instead, manually
start lightdm in the cases where we don't want ubiquity-dm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/start-ubiquity-dm
41
41
            ;;
42
42
    esac
43
43
done
44
 
[ "$ubiquity" ] || exit 0
 
44
 
 
45
if [ -z "$ubiquity" ]; then
 
46
    if [ -e /run/systemd/system ]; then
 
47
        systemctl start --no-block display-manager.service
 
48
    fi
 
49
    exit 0
 
50
fi
45
51
 
46
52
if [ -r /etc/default/locale ]; then
47
53
    . /etc/default/locale