diff options
| author | Simon Rettberg | 2016-03-24 14:40:35 +0100 |
|---|---|---|
| committer | root | 2016-03-24 14:40:35 +0100 |
| commit | 30fec85778bde0a7d46bdd7d6acbced73aca174e (patch) | |
| tree | 89fd1ec162f17c6c97779439b88552a329538bd1 | |
| parent | [nvidia_*] 361.28 (diff) | |
| download | tm-scripts-30fec85778bde0a7d46bdd7d6acbced73aca174e.tar.gz tm-scripts-30fec85778bde0a7d46bdd7d6acbced73aca174e.tar.xz tm-scripts-30fec85778bde0a7d46bdd7d6acbced73aca174e.zip | |
[dbus] Include dbus-launch, add missing dir so session daemon starts
| -rw-r--r-- | remote/modules/dbus/module.build | 2 | ||||
| -rw-r--r-- | remote/modules/dbus/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/dbus/module.conf.ubuntu | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/remote/modules/dbus/module.build b/remote/modules/dbus/module.build index c5b2d353..233ba751 100644 --- a/remote/modules/dbus/module.build +++ b/remote/modules/dbus/module.build @@ -43,6 +43,8 @@ build() { sed "s,%UUIDGEN%,$UUIDGEN,g;s,%DAEMON%,$DAEMON,g;s,%SEND%,$SEND,g;s,%DAEMON_ARGS%,$DAEMON_ARGS,g" "templates/dbus.service" \ > "$MODULE_BUILD_DIR/etc/systemd/system/dbus.service" \ || perror "Could not generate $MODULE_BUILD_DIR/etc/systemd/system/dbus.service" + # This is REQUIRED, otherwise the session daemon won't start (can be empty, but has to exist...) + mkdir -p "${MODULE_BUILD_DIR}/etc/dbus-1/session.d" } post_copy() { diff --git a/remote/modules/dbus/module.conf b/remote/modules/dbus/module.conf index 40f8a53d..5e5dc4f8 100644 --- a/remote/modules/dbus/module.conf +++ b/remote/modules/dbus/module.conf @@ -5,6 +5,7 @@ REQUIRED_BINARIES=" dbus-monitor dbus-send dbus-daemon-launch-helper + dbus-launch " REQUIRED_DIRECTORIES=" /etc/dbus-1 diff --git a/remote/modules/dbus/module.conf.ubuntu b/remote/modules/dbus/module.conf.ubuntu index 558eea7f..3f390d20 100644 --- a/remote/modules/dbus/module.conf.ubuntu +++ b/remote/modules/dbus/module.conf.ubuntu @@ -1,5 +1,6 @@ REQUIRED_CONTENT_PACKAGES=" dbus + dbus-x11 " REQUIRED_FILES+=" /etc/default/dbus |