From 422f03e9ac92fa1bf2c510caaa81b56a58c81d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 9 Jun 2017 23:01:46 +0200
Subject: [PATCH] Add qubes.VMRootShell service

It is the same as qubes.VMShell - the actual difference is in qrexec
policy, which contains 'user=root' option.

QubesOS/qubes-issues#2572
---
 Makefile                        | 1 +
 debian/qubes-core-agent.install | 1 +
 qubes-rpc/qubes.VMRootShell     | 4 ++++
 rpm_spec/core-agent.spec        | 1 +
 4 files changed, 7 insertions(+)
 create mode 100755 qubes-rpc/qubes.VMRootShell

diff --git a/Makefile b/Makefile
index 4517069..4915413 100644
--- a/Makefile
+++ b/Makefile
@@ -254,6 +254,7 @@ install-common:
 	install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDESERVICEDIR)
 	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 0755 qubes-rpc/qubes.VMRootShell $(DESTDIR)/etc/qubes-rpc
 	install -m 0755 qubes-rpc/qubes.OpenURL $(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
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 1b3b0c2..74b0420 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -26,6 +26,7 @@ etc/qubes-rpc/qubes.SuspendPre
 etc/qubes-rpc/qubes.SuspendPreAll
 etc/qubes-rpc/qubes.SyncNtpClock
 etc/qubes-rpc/qubes.VMShell
+etc/qubes-rpc/qubes.VMRootShell
 etc/qubes-rpc/qubes.WaitForSession
 etc/qubes-suspend-module-blacklist
 etc/qubes/autostart/*
diff --git a/qubes-rpc/qubes.VMRootShell b/qubes-rpc/qubes.VMRootShell
new file mode 100755
index 0000000..583de46
--- /dev/null
+++ b/qubes-rpc/qubes.VMRootShell
@@ -0,0 +1,4 @@
+#!/bin/sh
+# This is the same as qubes.VMShell. The actual difference is in qrexec policy,
+# which contains 'user=root' option.
+exec /bin/bash
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index c44957d..f90c773 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -492,6 +492,7 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes-rpc/qubes.OpenURL
 %config(noreplace) /etc/qubes-rpc/qubes.GetAppmenus
 %config(noreplace) /etc/qubes-rpc/qubes.VMShell
+%config(noreplace) /etc/qubes-rpc/qubes.VMRootShell
 %config(noreplace) /etc/qubes-rpc/qubes.SyncNtpClock
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPre
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPreAll