qubes.SuspendPreAll and qubes.SuspendPostAll services
Those services are called just before/after host suspend. Thanks @adrelanos for help. Fixes QubesOS/qubes-issues#1663
This commit is contained in:
		
							parent
							
								
									b1731c2768
								
							
						
					
					
						commit
						7301a898a1
					
				
							
								
								
									
										7
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
									
									
									
									
								
							@ -223,6 +223,8 @@ install-common:
 | 
				
			|||||||
	install -d $(DESTDIR)/etc/qubes-rpc
 | 
						install -d $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0644 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell,qubes.SyncNtpClock} $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell,qubes.SyncNtpClock} $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0644 qubes-rpc/{qubes.SuspendPre,qubes.SuspendPost,qubes.GetAppmenus} $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/{qubes.SuspendPre,qubes.SuspendPost,qubes.GetAppmenus} $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
 | 
						install -m 0755 qubes-rpc/qubes.SuspendPreAll $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
 | 
						install -m 0755 qubes-rpc/qubes.SuspendPostAll $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0644 qubes-rpc/qubes.WaitForSession $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/qubes.WaitForSession $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0644 qubes-rpc/qubes.DetachPciDevice $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/qubes.DetachPciDevice $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0644 qubes-rpc/qubes.{Backup,Restore} $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/qubes.{Backup,Restore} $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
@ -231,6 +233,11 @@ install-common:
 | 
				
			|||||||
	install -m 0644 qubes-rpc/qubes.SetDateTime $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0644 qubes-rpc/qubes.SetDateTime $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
	install -m 0755 qubes-rpc/qubes.InstallUpdatesGUI $(DESTDIR)/etc/qubes-rpc
 | 
						install -m 0755 qubes-rpc/qubes.InstallUpdatesGUI $(DESTDIR)/etc/qubes-rpc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						install -d $(DESTDIR)/etc/qubes/suspend-pre.d
 | 
				
			||||||
 | 
						install -m 0644 qubes-rpc/suspend-pre.README $(DESTDIR)/etc/qubes/suspend-pre.d/README
 | 
				
			||||||
 | 
						install -d $(DESTDIR)/etc/qubes/suspend-post.d
 | 
				
			||||||
 | 
						install -m 0644 qubes-rpc/suspend-post.README $(DESTDIR)/etc/qubes/suspend-post.d/README
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	install -d $(DESTDIR)/usr/share/nautilus-python/extensions
 | 
						install -d $(DESTDIR)/usr/share/nautilus-python/extensions
 | 
				
			||||||
	install -m 0644 qubes-rpc/*_nautilus.py $(DESTDIR)/usr/share/nautilus-python/extensions
 | 
						install -m 0644 qubes-rpc/*_nautilus.py $(DESTDIR)/usr/share/nautilus-python/extensions
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										28
									
								
								qubes-rpc/qubes.SuspendPostAll
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										28
									
								
								qubes-rpc/qubes.SuspendPostAll
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,28 @@
 | 
				
			|||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# The Qubes OS Project, http://www.qubes-os.org
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Copyright (C) 2016  Marek Marczykowski-Górecki
 | 
				
			||||||
 | 
					#                                     <marmarek@invisiblethingslab.com>
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This program is free software; you can redistribute it and/or
 | 
				
			||||||
 | 
					# modify it under the terms of the GNU General Public License
 | 
				
			||||||
 | 
					# as published by the Free Software Foundation; either version 2
 | 
				
			||||||
 | 
					# of the License, or (at your option) any later version.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This program is distributed in the hope that it will be useful,
 | 
				
			||||||
 | 
					# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
				
			||||||
 | 
					# GNU General Public License for more details.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# You should have received a copy of the GNU General Public License
 | 
				
			||||||
 | 
					# along with this program; if not, write to the Free Software
 | 
				
			||||||
 | 
					# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					for script in /etc/qubes/suspend-post.d/*.sh; do
 | 
				
			||||||
 | 
					    if [ -x "$script" ]; then
 | 
				
			||||||
 | 
					        "$script"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					done
 | 
				
			||||||
							
								
								
									
										28
									
								
								qubes-rpc/qubes.SuspendPreAll
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										28
									
								
								qubes-rpc/qubes.SuspendPreAll
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,28 @@
 | 
				
			|||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# The Qubes OS Project, http://www.qubes-os.org
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Copyright (C) 2016  Marek Marczykowski-Górecki
 | 
				
			||||||
 | 
					#                                     <marmarek@invisiblethingslab.com>
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This program is free software; you can redistribute it and/or
 | 
				
			||||||
 | 
					# modify it under the terms of the GNU General Public License
 | 
				
			||||||
 | 
					# as published by the Free Software Foundation; either version 2
 | 
				
			||||||
 | 
					# of the License, or (at your option) any later version.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This program is distributed in the hope that it will be useful,
 | 
				
			||||||
 | 
					# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
				
			||||||
 | 
					# GNU General Public License for more details.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# You should have received a copy of the GNU General Public License
 | 
				
			||||||
 | 
					# along with this program; if not, write to the Free Software
 | 
				
			||||||
 | 
					# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					for script in /etc/qubes/suspend-pre.d/*.sh; do
 | 
				
			||||||
 | 
					    if [ -x "$script" ]; then
 | 
				
			||||||
 | 
					        "$script"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					done
 | 
				
			||||||
							
								
								
									
										2
									
								
								qubes-rpc/suspend-post.README
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								qubes-rpc/suspend-post.README
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					All executable files with `.sh` suffix in this directory will be executed as
 | 
				
			||||||
 | 
					root just after host resume from suspend.
 | 
				
			||||||
							
								
								
									
										2
									
								
								qubes-rpc/suspend-pre.README
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								qubes-rpc/suspend-pre.README
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					All executable files with `.sh` suffix in this directory will be executed as
 | 
				
			||||||
 | 
					root just before host suspend.
 | 
				
			||||||
@ -337,7 +337,9 @@ rm -f %{name}-%{version}
 | 
				
			|||||||
%config(noreplace) /etc/qubes-rpc/qubes.VMShell
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.VMShell
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.SyncNtpClock
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.SyncNtpClock
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPre
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.SuspendPre
 | 
				
			||||||
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.SuspendPreAll
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
 | 
				
			||||||
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice
 | 
				
			||||||
%config(noreplace) /etc/qubes-rpc/qubes.Backup
 | 
					%config(noreplace) /etc/qubes-rpc/qubes.Backup
 | 
				
			||||||
@ -350,6 +352,10 @@ rm -f %{name}-%{version}
 | 
				
			|||||||
%dir /etc/qubes/autostart
 | 
					%dir /etc/qubes/autostart
 | 
				
			||||||
/etc/qubes/autostart/README.txt
 | 
					/etc/qubes/autostart/README.txt
 | 
				
			||||||
%config /etc/qubes/autostart/*.desktop.d/30_qubes.conf
 | 
					%config /etc/qubes/autostart/*.desktop.d/30_qubes.conf
 | 
				
			||||||
 | 
					%dir /etc/qubes/suspend-pre.d
 | 
				
			||||||
 | 
					/etc/qubes/suspend-pre.d/README
 | 
				
			||||||
 | 
					%dir /etc/qubes/suspend-post.d
 | 
				
			||||||
 | 
					/etc/qubes/suspend-post.d/README
 | 
				
			||||||
%config(noreplace) /etc/sudoers.d/qubes
 | 
					%config(noreplace) /etc/sudoers.d/qubes
 | 
				
			||||||
%config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
 | 
					%config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
 | 
				
			||||||
%config(noreplace) /etc/sysctl.d/20_tcp_timestamps.conf
 | 
					%config(noreplace) /etc/sysctl.d/20_tcp_timestamps.conf
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user