Merge into trunk : systemd-unit : Code : Network Menu

Status:	Merged
Merged at revision:	637
Proposed branch:	lp:~ted/indicator-network/systemd-unit
Merge into:	lp:indicator-network
Diff against target:	126 lines (+65/-1) 7 files modified data/CMakeLists.txt (+41/-0) data/indicator-network-secret-agent.override (+1/-0) data/indicator-network-secret-agent.service.in (+7/-0) data/indicator-network.override (+1/-0) data/indicator-network.service.in (+9/-0) debian/control (+4/-1) debian/indicator-network.install (+2/-0)
To merge this branch:	bzr merge lp:~ted/indicator-network/systemd-unit
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Martin Pitt			Disapprove on 2016-10-19
unity-api-1-bot	continuous-integration		Needs Fixing on 2016-09-21
PS Jenkins bot	continuous-integration		Pending
Indicator Applet Developers		2016-07-19	Pending
Review via email: mp+300443@code.launchpad.net

Commit Message

Add a systemd user session unit file

Description of the Change

Networking is important

lp:~ted/indicator-network/systemd-unit updated on 2016-07-29

611. By Ted Gould on 2016-07-20: Adding a restart rule
612. By Ted Gould on 2016-07-22: Merge trunk
613. By Ted Gould on 2016-07-29: Yakkety build fixes and sync to trunk

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-12:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/1/rebuild

review: Needs Fixing (continuous-integration)

lp:~ted/indicator-network/systemd-unit updated on 2016-09-21

614. By Ted Gould on 2016-09-21: Merging in trunk

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/6/rebuild

review: Needs Fixing (continuous-integration)

Martin Pitt (pitti) wrote on 2016-10-19:

#

This needs a re-merge to trunk; I created https://code.launchpad.net/~pitti/indicator-network/systemd-unit/+merge/308790 for this, so this is now superseded. Please close.

review: Disapprove

 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2015-11-20 13:14:50 +0000
 +++ data/CMakeLists.txt	2016-09-21 15:07:00 +0000
@@ -55,6 +55,47 @@
+ )
  ###########################
++# Indicator-network systemd jobs
++###########################
++
++# Uncomment when we drop Vivid
++# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
++set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
++message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
++
++configure_file (
++  indicator-network-secret-agent.service.in
++  indicator-network-secret-agent.service
++  @ONLY
++)
++
++configure_file (
++  indicator-network.service.in
++  indicator-network.service
++  @ONLY
++)
++
++install (
++  FILES "${CMAKE_CURRENT_BINARY_DIR}/indicator-network-secret-agent.service"
++  DESTINATION ${SYSTEMD_USER_DIR}
++)
++
++install (
++  FILES "${CMAKE_CURRENT_BINARY_DIR}/indicator-network.service"
++  DESTINATION ${SYSTEMD_USER_DIR}
++)
++
++###########################
++# Indicator-network systemd Upstart overrides
++###########################
++
++set (SYSTEMD_UPSTART_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
++install (
++  FILES indicator-network.override indicator-network-secret-agent.override
++  DESTINATION ${SYSTEMD_UPSTART_DIR}
++)
++
++###########################
  # GSettings
  ###########################
 === added file 'data/indicator-network-secret-agent.override'
 --- data/indicator-network-secret-agent.override	1970-01-01 00:00:00 +0000
 +++ data/indicator-network-secret-agent.override	2016-09-21 15:07:00 +0000
@@ -0,0 +1,1 @@
++manual
 === added file 'data/indicator-network-secret-agent.service.in'
 --- data/indicator-network-secret-agent.service.in	1970-01-01 00:00:00 +0000
 +++ data/indicator-network-secret-agent.service.in	2016-09-21 15:07:00 +0000
@@ -0,0 +1,7 @@
++[Unit]
++Description=Indicator Network Secret Agent
++PartOf=indicator-network.service
++
++[Service]
++ExecStart=@AGENT_SERVICE@
++Restart=on-failure
 === added file 'data/indicator-network.override'
 --- data/indicator-network.override	1970-01-01 00:00:00 +0000
 +++ data/indicator-network.override	2016-09-21 15:07:00 +0000
@@ -0,0 +1,1 @@
++manual
 === added file 'data/indicator-network.service.in'
 --- data/indicator-network.service.in	1970-01-01 00:00:00 +0000
 +++ data/indicator-network.service.in	2016-09-21 15:07:00 +0000
@@ -0,0 +1,9 @@
++[Unit]
++Description=Indicator Network Backend
++PartOf=graphical-session.target
++After=indicators-pre.target
++Wants=indicator-network-secret-agent.service
++
++[Service]
++ExecStart=@NETWORK_SERVICE@
++Restart=on-failure
 === modified file 'debian/control'
 --- debian/control	2016-09-15 15:55:31 +0000
 +++ debian/control	2016-09-21 15:07:00 +0000
@@ -30,7 +30,9 @@
                 qtbase5-dev-tools,
                 qtdeclarative5-dev,
                 qtdeclarative5-dev-tools,
--               qttools5-dev-tools
++               qttools5-dev-tools,
++               valgrind [amd64 armhf i386 powerpc],
++               systemd,
  Standards-Version: 3.9.5
  # If you aren't a member of ~indicator-applet-developers but need to upload
  # packaging changes, just go ahead. ~indicator-applet-developers will notice
@@ -50,6 +52,7 @@
           network-manager-pptp,
           ubuntu-mobile-icons (>= 13.04+13.10.20131014),
           urfkill,
++         indicator-common,
  Suggests: ofono
  Conflicts: chewie,
             indicators-client-plugin-network,
 === modified file 'debian/indicator-network.install'
 --- debian/indicator-network.install	2015-12-04 13:18:04 +0000
 +++ debian/indicator-network.install	2016-09-21 15:07:00 +0000
@@ -1,7 +1,9 @@
  usr/share/upstart/xdg/autostart/indicator-network.desktop
  usr/share/upstart/sessions/*
++usr/share/upstart/systemd-session
  usr/share/glib-2.0/schemas/com.canonical.indicator.network.gschema.xml
  usr/share/unity/indicators/com.canonical.indicator.network
  usr/lib/*/indicator-network/*
++usr/lib/systemd
  etc/xdg/autostart/indicator-network.desktop
  usr/share/locale

Network Menu

Merge lp:~ted/indicator-network/systemd-unit into lp:indicator-network

Commit Message

Description of the Change

Preview Diff

Subscribers