Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
This commit is contained in:
		
						commit
						cc83e31047
					
				| @ -99,7 +99,7 @@ def vm_run_cmd(vm, cmd, options): | ||||
| 
 | ||||
|     if not vm.is_running(): | ||||
|         if not options.auto: | ||||
|             print "VM '{0}' is not running, please start it first, or use the '--auto' switch" | ||||
|             print "VM '{0}' is not running. Please start it first or use the '--auto' switch".format(vm.name) | ||||
|             exit (1) | ||||
|     	try: | ||||
|             if options.verbose: | ||||
|  | ||||
| @ -54,6 +54,7 @@ exit 0 | ||||
| fi | ||||
| 
 | ||||
| adduser --create-home user | ||||
| su user -c 'mkdir -p /home/user/.local/share' | ||||
| su user -c 'mkdir -p /home/user/.gnome2/nautilus-scripts' | ||||
| su user -c 'ln -s /usr/lib/qubes/qvm-copy-to-vm2.gnome /home/user/.gnome2/nautilus-scripts/"Copy to other AppVM"' | ||||
| su user -c 'ln -s /usr/bin/qvm-open-in-dvm2 /home/user/.gnome2/nautilus-scripts/"Open in DisposableVM"' | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Joanna Rutkowska
						Joanna Rutkowska