687567d3ee
The actual problem I am trying to fix with this is fallout from the introduction of `/usr/libexec/rpm-ostreed`, which required a SELinux policy change. Specifically for CentOS, the base policy is rev'd slowly. My hope was that by merging the daemon code back into `/usr/bin/rpm-ostree` which is labeled `install_exec_t`, starting via systemd would do the right thing. It turns out that doesn't happen. Now later, I'm picking this patch back up because I want to do multprocessing in the daemon (and in the core), and it makes sense to share code between them, because multiprocessing will need to go through a re-exec path. Another benefit is we avoid duplicated text (libglnx, internal helpers) between the two binaries. Closes: #292 Approved by: jlebon
70 lines
2.1 KiB
Bash
Executable File
70 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Configure a D-Bus session for shell script tests
|
|
#
|
|
# Copyright (C) 2015 Red Hat, Inc.
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library 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
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
set -e
|
|
|
|
. ${commondir}/libtest.sh
|
|
|
|
# libtest.sh should have added the builddir which contains rpm-ostreed to our
|
|
# path
|
|
exec_binary="$(which rpm-ostree)"
|
|
|
|
mkdir -p sysroot
|
|
mkdir -p session-services
|
|
|
|
# Create a busconfig file with a custom <servicedir>
|
|
cat > session.conf <<EOF
|
|
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
|
|
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
|
<busconfig>
|
|
<type>session</type>
|
|
|
|
<!-- Enable to assist with debugging -->
|
|
<!-- <syslog/> -->
|
|
|
|
<listen>unix:tmpdir=/tmp</listen>
|
|
|
|
<servicedir>${test_tmpdir}/session-services</servicedir>
|
|
|
|
<policy context="default">
|
|
<allow send_destination="*" eavesdrop="true"/>
|
|
<allow eavesdrop="true"/>
|
|
<allow own="*"/>
|
|
</policy>
|
|
</busconfig>
|
|
EOF
|
|
|
|
# Create a service file with a custom --sysroot
|
|
cat > session-services/rpmostree.service <<EOF
|
|
[D-BUS Service]
|
|
Name=org.projectatomic.rpmostree1
|
|
Exec=${exec_binary} internals start-daemon --debug --sysroot=${test_tmpdir}/sysroot
|
|
EOF
|
|
|
|
# Tell rpm-ostree to connect to the session bus instead of system
|
|
export RPMOSTREE_USE_SESSION_BUS=1
|
|
|
|
# Don't flag deployments as immutable so that test harnesses can
|
|
# easily clean up.
|
|
export OSTREE_SYSROOT_DEBUG=mutable-deployments
|
|
|
|
exec dbus-run-session --config-file=${test_tmpdir}/session.conf $@
|