Author: baggins Date: Fri Apr 27 16:24:07 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- move systemd banner to trigger
---- Files affected:
packages/openssh:
openssh.spec (1.383 -> 1.384)
---- Diffs:
================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.383 packages/openssh/openssh.spec:1.384
--- packages/openssh/openssh.spec:1.383 Tue Apr 24 07:32:51 2012
+++ packages/openssh/openssh.spec Fri Apr 27 18:24:02 2012
@@ -680,15 +680,6 @@
umask 022
echo "ssh" >> /etc/security/passwd.conf
fi
-if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
-%banner %{name}-server -e << EOF
-!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!
-! Native systemd support for sshd has been installed. !
-! Restarting sshd.service with systemctl WILL kill all !
-! active ssh sessions (daemon as such will be started). !
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-EOF
-fi
NORESTART=1
%systemd_post sshd.service
@@ -725,6 +716,15 @@
fi
fi
%systemd_trigger sshd.service
+if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
+%banner %{name}-server -e << EOF
+!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!
+! Native systemd support for sshd has been installed. !
+! Restarting sshd.service with systemctl WILL kill all !
+! active ssh sessions (daemon as such will be started). !
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOF
+fi
%post server-upstart
%upstart_post sshd
@@ -847,6 +847,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.384 2012/04/27 16:24:02 baggins
+- move systemd banner to trigger
+
Revision 1.383 2012/04/24 05:32:51 arekm
- up to 6.0p1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/openssh/openssh.spec?r1=1.383&r2=1.384
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
