Hello community, here is the log from the commit of package openvpn for openSUSE:Factory checked in at 2013-05-16 11:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvpn (Old) and /work/SRC/openSUSE:Factory/.openvpn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openvpn" Changes: -------- --- /work/SRC/openSUSE:Factory/openvpn/openvpn.changes 2013-04-23 17:25:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openvpn.new/openvpn.changes 2013-05-16 11:18:49.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 6 11:13:49 UTC 2013 - [email protected] + +- Try to migrate openvpn.service autostart to openvpn@<CONF>.service + instance enablement. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvpn.spec ++++++ --- /var/tmp/diff_new_pack.g9VTJT/_old 2013-05-16 11:18:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g9VTJT/_new 2013-05-16 11:18:50.000000000 +0200 @@ -178,6 +178,40 @@ %__mkdir_p -m750 %{_localstatedir}/run/openvpn %if %{with_systemd} %service_add_post %{name}.target +# try to migrate openvpn.service autostart to openvpn@<CONF>.service +if test ${FIRST_ARG:-$1} -ge 1 -a \ + -x /bin/systemctl -a \ + -f /etc/sysconfig/openvpn -a \ + -f /var/adm/fillup-templates/sysconfig.openvpn && \ + /bin/systemctl --quiet is-enabled openvpn.service &>/dev/null ; +then + . /etc/sysconfig/openvpn + try_service_cgroup_join() + { + local p="/var/run/openvpn/${1}.pid" + local t="/sys/fs/cgroup/systemd/system/[email protected]/${1}" + /sbin/checkproc -p "$p" "%{_sbindir}/openvpn" &>/dev/null || return 0 + test -d "$t" || mkdir -p "$t" 2>/dev/null || return 1 + cat "$p" > "$t/tasks" 2>/dev/null || return 1 + } + if test "X$OPENVPN_AUTOSTART" != "X" ; then + for conf in $OPENVPN_AUTOSTART ; do + test -f "/etc/openvpn/${conf}.conf" && \ + /bin/systemctl enable "openvpn@${conf}.service" && \ + try_service_cgroup_join "$conf" || continue + done + else + shopt -s nullglob || : + for conf in /etc/openvpn/*.conf ; do + conf=${conf##*/} + conf=${conf%.conf} + test -f "/etc/openvpn/${conf}.conf" && \ + /bin/systemctl enable "openvpn@${conf}.service" && \ + try_service_cgroup_join "$conf" || continue + done + fi +fi +rm -f /etc/sysconfig/openvpn || : %else %{?fillup_and_insserv:%fillup_and_insserv} %endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
