~ubuntu-installer/ubiquity/trunk

« back to all changes in this revision

Viewing changes to bin/oem-config-firstboot

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2015-04-02 17:57:55 UTC
  • mfrom: (6283.1.2 ubiquity)
  • Revision ID: mathieu.trudel-lapierre@canonical.com-20150402175755-8dn32c4ih7dghm5u
* Overhaul for proper systemd support (LP: #1436937)
* bin/oem-config-prepare: set the systemd default target to oem-config.target
  instead of using /var/lib/oem-config/run as a flag.
* bin/oem-config-firstboot:
  - after removing the oem user, set the default target back to graphical.
  - call for systemd to start the graphical target, so as to complete booting
    to graphical or to TTYs after oem-config-firstboot has run.
* debian/oem-config.target: create a new target for oem-config so that it can
  start without conflicting with a display-manager that may also want to
  start and use the oem user in auto-login.
* debian/oem-config.oem-config.service: simplify the service's start
  conditions; we don't really need to worry about Before/After since we'll
  run in our own isolated target.
* debian/oem-config.install: force the installation of the new target in the
  right location for systemd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
77
77
                        pkill -u oem || true
78
78
                        userdel --force --remove oem || true
79
79
                fi
 
80
                /bin/systemctl set-default graphical.target || true
 
81
                /bin/systemctl --no-block isolate graphical.target || true
80
82
                exit 0
81
83
        elif [ "$CODE" -eq 10 ]; then
82
84
                cat <<EOF