577b79db7e
- Rebase on upstream f56a72ac9e86 - sepolicy: fix sepolicy manpage -w - sandbox: add -R option to alternate XDG_RUNTIME_DIR - Remove dependency on the Python module distutils
76 lines
2.7 KiB
Diff
76 lines
2.7 KiB
Diff
From 239f039edd2c4030d373baa31f42651075b5927b Mon Sep 17 00:00:00 2001
|
|
From: Petr Lautrbach <plautrba@redhat.com>
|
|
Date: Wed, 18 Jul 2018 09:09:35 +0200
|
|
Subject: [PATCH] sandbox: Use matchbox-window-manager instead of openbox
|
|
Content-type: text/plain
|
|
|
|
---
|
|
sandbox/sandbox | 4 ++--
|
|
sandbox/sandbox.8 | 2 +-
|
|
sandbox/sandboxX.sh | 14 --------------
|
|
3 files changed, 3 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/sandbox/sandbox b/sandbox/sandbox
|
|
index 770807345858..df3af9260c7f 100644
|
|
--- a/sandbox/sandbox
|
|
+++ b/sandbox/sandbox
|
|
@@ -270,7 +270,7 @@ class Sandbox:
|
|
copyfile(f, "/tmp", self.__tmpdir)
|
|
copyfile(f, "/var/tmp", self.__tmpdir)
|
|
|
|
- def __setup_sandboxrc(self, wm="/usr/bin/openbox"):
|
|
+ def __setup_sandboxrc(self, wm="/usr/bin/matchbox-window-manager"):
|
|
execfile = self.__homedir + "/.sandboxrc"
|
|
fd = open(execfile, "w+")
|
|
if self.__options.session:
|
|
@@ -369,7 +369,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
|
|
|
|
parser.add_option("-W", "--windowmanager", dest="wm",
|
|
type="string",
|
|
- default="/usr/bin/openbox",
|
|
+ default="/usr/bin/matchbox-window-manager",
|
|
help=_("alternate window manager"))
|
|
|
|
parser.add_option("-l", "--level", dest="level",
|
|
diff --git a/sandbox/sandbox.8 b/sandbox/sandbox.8
|
|
index 1ee0ecea96d1..775e4b231204 100644
|
|
--- a/sandbox/sandbox.8
|
|
+++ b/sandbox/sandbox.8
|
|
@@ -80,7 +80,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz
|
|
\fB\-W\fR \fB\-\-windowmanager\fR
|
|
Select alternative window manager to run within
|
|
.B sandbox \-X.
|
|
-Default to /usr/bin/openbox.
|
|
+Default to /usr/bin/matchbox-window-manager.
|
|
.TP
|
|
\fB\-X\fR
|
|
Create an X based Sandbox for gui apps, temporary files for
|
|
diff --git a/sandbox/sandboxX.sh b/sandbox/sandboxX.sh
|
|
index 4774528027ef..c211ebc14549 100644
|
|
--- a/sandbox/sandboxX.sh
|
|
+++ b/sandbox/sandboxX.sh
|
|
@@ -6,20 +6,6 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8
|
|
[ -z $2 ] && export DPI="96" || export DPI="$2"
|
|
trap "exit 0" HUP
|
|
|
|
-mkdir -p ~/.config/openbox
|
|
-cat > ~/.config/openbox/rc.xml << EOF
|
|
-<openbox_config xmlns="http://openbox.org/3.4/rc"
|
|
- xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
-<applications>
|
|
- <application class="*">
|
|
- <decor>no</decor>
|
|
- <desktop>all</desktop>
|
|
- <maximized>yes</maximized>
|
|
- </application>
|
|
-</applications>
|
|
-</openbox_config>
|
|
-EOF
|
|
-
|
|
(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
|
|
export DISPLAY=:$D
|
|
cat > ~/seremote << __EOF
|
|
--
|
|
2.38.1
|
|
|