diff options
| author | Simon Rettberg | 2020-08-03 18:04:59 +0200 |
|---|---|---|
| committer | Your Name | 2020-08-03 18:04:59 +0200 |
| commit | a069ecafe76710cdc758f5c79a7c000bfe3a7e76 (patch) | |
| tree | bc8de78515c7b5d0c24ffc3e7e216e5d846082bb /core/modules/polkit | |
| parent | [rfs-stage31] Fix hostname lookup for newer busybox nslookup (diff) | |
| download | mltk-a069ecafe76710cdc758f5c79a7c000bfe3a7e76.tar.gz mltk-a069ecafe76710cdc758f5c79a7c000bfe3a7e76.tar.xz mltk-a069ecafe76710cdc758f5c79a7c000bfe3a7e76.zip | |
[systemd-distro] Get this module into working state, switch
Diffstat (limited to 'core/modules/polkit')
| -rw-r--r-- | core/modules/polkit/module.build | 6 | ||||
| -rw-r--r-- | core/modules/polkit/module.conf | 3 | ||||
| -rw-r--r-- | core/modules/polkit/templates/dbus.service | 6 | ||||
| -rw-r--r-- | core/modules/polkit/templates/systemd.service | 8 |
4 files changed, 2 insertions, 21 deletions
diff --git a/core/modules/polkit/module.build b/core/modules/polkit/module.build index 634d9c87..b956f23c 100644 --- a/core/modules/polkit/module.build +++ b/core/modules/polkit/module.build @@ -11,11 +11,7 @@ build () { list_packet_files > "$COPYLIST" [ -n "$REQUIRED_DIR_STRUCT" ] && find $REQUIRED_DIR_STRUCT -type d >> "$COPYLIST" tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}" - local POLPATH=$(find "$MODULE_BUILD_DIR" -name polkitd -executable | head -n 1) - POLPATH="/${POLPATH#$MODULE_BUILD_DIR}" - mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system" "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services" "$MODULE_BUILD_DIR/var/lib/polkit" - sed "s,%POLKITD%,${POLPATH},g" "${MODULE_DIR}/templates/systemd.service" > "$MODULE_BUILD_DIR/etc/systemd/system/polkit.service" || perror "Could not generate polkit.service for systemd" - sed "s,%POLKITD%,${POLPATH},g" "${MODULE_DIR}/templates/dbus.service" > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service" || perror "Could not generate polkit.service for dbus" + mkdir -p "$MODULE_BUILD_DIR/var/lib/polkit" } post_copy() { diff --git a/core/modules/polkit/module.conf b/core/modules/polkit/module.conf index b86e1a5c..7a4293cd 100644 --- a/core/modules/polkit/module.conf +++ b/core/modules/polkit/module.conf @@ -7,7 +7,6 @@ REQUIRED_DIRECTORIES=" " REQUIRED_FILES=" /usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service - /etc/systemd/system/polkit.service + /lib/systemd/system/polkit.service " -#REQUIRED_LIBRARIES="libmozjs185" diff --git a/core/modules/polkit/templates/dbus.service b/core/modules/polkit/templates/dbus.service deleted file mode 100644 index c9ee6c8b..00000000 --- a/core/modules/polkit/templates/dbus.service +++ /dev/null @@ -1,6 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.PolicyKit1 -Exec=%POLKITD% --no-debug -User=root -SystemdService=polkit.service - diff --git a/core/modules/polkit/templates/systemd.service b/core/modules/polkit/templates/systemd.service deleted file mode 100644 index 747fd7eb..00000000 --- a/core/modules/polkit/templates/systemd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=the cancer that is called PolKit - -[Service] -Type=dbus -BusName=org.freedesktop.PolicyKit1 -ExecStart=%POLKITD% --no-debug - |