Merge remote-tracking branch 'origin/pr/151'
* origin/pr/151: Introduce /usr/share/qubes/marker-vm
This commit is contained in:
		
						commit
						3b538df5d0
					
				
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @ -312,6 +312,8 @@ install-common: install-doc | |||||||
| 	install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d | 	install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d | ||||||
| 	install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf | 	install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf | ||||||
| 
 | 
 | ||||||
|  | 	install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| 	install -d $(DESTDIR)/var/run/qubes | 	install -d $(DESTDIR)/var/run/qubes | ||||||
| 	install -d $(DESTDIR)/rw | 	install -d $(DESTDIR)/rw | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								debian/qubes-core-agent.install
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/qubes-core-agent.install
									
									
									
									
										vendored
									
									
								
							| @ -145,3 +145,4 @@ usr/share/applications/*.desktop | |||||||
| usr/share/man/man1/qvm-* | usr/share/man/man1/qvm-* | ||||||
| usr/share/qubes/mime-override/globs | usr/share/qubes/mime-override/globs | ||||||
| usr/share/qubes/qubes-master-key.asc | usr/share/qubes/qubes-master-key.asc | ||||||
|  | usr/share/qubes/marker-vm | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								misc/marker-vm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								misc/marker-vm
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | |||||||
|  | # This is just a marker file for Qubes OS VM. | ||||||
| @ -668,6 +668,7 @@ rm -f %{name}-%{version} | |||||||
| /usr/lib/qubes-bind-dirs.d/30_cron.conf | /usr/lib/qubes-bind-dirs.d/30_cron.conf | ||||||
| /usr/share/applications/qubes-run-terminal.desktop | /usr/share/applications/qubes-run-terminal.desktop | ||||||
| /usr/share/qubes/serial.conf | /usr/share/qubes/serial.conf | ||||||
|  | /usr/share/qubes/marker-vm | ||||||
| /usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override | /usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override | ||||||
| /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override | /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override | ||||||
| /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override | /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Marek Marczykowski-Górecki
						Marek Marczykowski-Górecki