Merge pull request #124 from mtomaschewski/cleanup

systemd: do not install wicked@.service example

Author: wipawel

etc/Makefile.am

@@ -25,7 +25,6 @@ dbus_config_DATA		= \
 
 systemd_unit_files		= \
 	systemd/wicked.service		\
-	systemd/wicked@.service		\
 	systemd/wickedd.service		\
 	systemd/wickedd-auto4.service	\
 	systemd/wickedd-dhcp4.service	\

etc/systemd/wicked@.service.in

@@ -1,13 +1,23 @@
+#
+# This is a template example intended to implement
+# a multi-stage network start.
+#
 [Unit]
-Description=wicked managed network interface %i
+Description=wicked managed network in stage %i
 Requisite=wickedd.service
-PartOf=wicked.service
-BindsTo=sys-subsystem-net-devices-%i.device
+#Wants=network.target
+#Before=network.target
+After=wickedd.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 LimitCORE=infinity
 EnvironmentFile=-/etc/sysconfig/network/config
-ExecStart=@wicked_sbindir@/wicked $WICKED_DEBUG_PARAM ifup $WICKED_IFUP_PARAM %i
+ExecStart=@wicked_sbindir@/wicked $WICKED_DEBUG_PARAM ifup --boot-stage %i -- all
+ExecStop=@wicked_sbindir@/wicked $WICKED_DEBUG_PARAM ifdown --boot-stage %i -- all
+
+[Install]
+Also=wickedd.service
+#WantedBy=some.target
 

wicked.spec.in

@@ -274,7 +274,6 @@ fi
 %_unitdir/wickedd-dhcp6.service
 %_unitdir/wickedd-nanny.service
 %_unitdir/wickedd.service
-%_unitdir/wicked@.service
 %_unitdir/wicked.service
 %_sbindir/ifup
 %if "%_sbindir" != "/sbin"