diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 12 | ||||
| -rw-r--r-- | data/Makefile.in | 19 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 12 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 4 |
4 files changed, 41 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index f91d3a82..2a1d1cf4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,15 @@ if HAVE_SYSTEMD -systemdsystemunit_DATA = NetworkManager.service +systemdsystemunit_DATA = \ + NetworkManager.service \ + NetworkManager-wait-online.service NetworkManager.service: NetworkManager.service.in $(edit) $< >$@ +NetworkManager-wait-online.service: NetworkManager-wait-online.service.in + $(edit) $< >$@ + servicedir = $(datadir)/dbus-1/system-services service_in_files = org.freedesktop.NetworkManager.service.in service_DATA = $(service_in_files:.service.in=.service) @@ -14,13 +19,14 @@ $(service_DATA): $(service_in_files) Makefile endif edit = sed \ + -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' EXTRA_DIST = \ NetworkManager.service.in \ + NetworkManager-wait-online.service.in \ org.freedesktop.NetworkManager.service.in -CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service - +CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service diff --git a/data/Makefile.in b/data/Makefile.in index b3428d80..a5061e00 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -101,6 +101,10 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -218,6 +222,8 @@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ +QT_CFLAGS = @QT_CFLAGS@ +QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ @@ -239,6 +245,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -286,20 +293,25 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = NetworkManager.service +@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ +@HAVE_SYSTEMD_TRUE@ NetworkManager.service \ +@HAVE_SYSTEMD_TRUE@ NetworkManager-wait-online.service + @HAVE_SYSTEMD_TRUE@servicedir = $(datadir)/dbus-1/system-services @HAVE_SYSTEMD_TRUE@service_in_files = org.freedesktop.NetworkManager.service.in @HAVE_SYSTEMD_TRUE@service_DATA = $(service_in_files:.service.in=.service) edit = sed \ + -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' EXTRA_DIST = \ NetworkManager.service.in \ + NetworkManager-wait-online.service.in \ org.freedesktop.NetworkManager.service.in -CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service +CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service all: all-am .SUFFIXES: @@ -534,6 +546,9 @@ uninstall-am: uninstall-serviceDATA uninstall-systemdsystemunitDATA @HAVE_SYSTEMD_TRUE@NetworkManager.service: NetworkManager.service.in @HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ +@HAVE_SYSTEMD_TRUE@NetworkManager-wait-online.service: NetworkManager-wait-online.service.in +@HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ + @HAVE_SYSTEMD_TRUE@$(service_DATA): $(service_in_files) Makefile @HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in new file mode 100644 index 00000000..1a43d174 --- /dev/null +++ b/data/NetworkManager-wait-online.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=Network Manager Wait Online +Requires=NetworkManager.service +Wants=network.target +Before=network.target + +[Service] +Type=oneshot +ExecStart=@bindir@/nm-online -q --timeout=30 + +[Install] +WantedBy=multi-user.target diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index d93fc670..bb169fb4 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,6 +1,8 @@ [Unit] Description=Network Manager After=syslog.target +Wants=network.target +Before=network.target [Service] Type=dbus @@ -8,5 +10,5 @@ BusName=org.freedesktop.NetworkManager ExecStart=@sbindir@/NetworkManager --no-daemon [Install] -WantedBy=network.target multi-user.target +WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service |