Ver código fonte

Merge remote-tracking branch 'origin/pr/51'

* origin/pr/51:
  Prevent services from being accidentally restarted by `needrestart`.
Marek Marczykowski-Górecki 8 anos atrás
pai
commit
c603f32d23
2 arquivos alterados com 5 adições e 0 exclusões
  1. 3 0
      Makefile
  2. 2 0
      misc/50_qubes.conf

+ 3 - 0
Makefile

@@ -147,6 +147,9 @@ install-common:
 	install -D -m 0440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
 	install -D -m 0644 misc/20_tcp_timestamps.conf $(DESTDIR)/etc/sysctl.d/20_tcp_timestamps.conf
 
+	install -d $(DESTDIR)/etc/needrestart/conf.d
+	install -D -m 0644 misc/50_qubes.conf $(DESTDIR)/etc/needrestart/conf.d/50_qubes.conf
+
 	install -d $(DESTDIR)/var/lib/qubes
 
 	install -D misc/xenstore-watch $(DESTDIR)/usr/bin/xenstore-watch-qubes

+ 2 - 0
misc/50_qubes.conf

@@ -0,0 +1,2 @@
+$nrconf{override_rc}->{q(^qubes-core-agent-linux)} = 0;
+$nrconf{override_rc}->{q(^qubes-gui-agent)} = 0;