Skip to content
Snippets Groups Projects

Use systemd preset to configure services in pmaports

Merged Imported Administrator requested to merge craftyguy/systemd-service-presets into master_staging_systemd

This is based on a ton of work from @jane400, myself, and @calebccff. The design for this was written up in #2937 (closed).

Fixes #2937 (closed) Fixes #2913 (closed)

TODO:

  • squash commits
  • finish migrating earlier rev using new systemd apkbuild vars to use new macro
  • write up design of this for wiki, in #2937 (closed)
  • Get branch building again.
  • Push patches in this branch to edge/master branch
  • test
Edited by Administrator

Merge request reports

Checking pipeline status.

Approved by

Merged by AdministratorAdministrator 7 months ago (Sep 3, 2024 3:45pm UTC)

Merge details

  • Changes merged into master_staging_systemd with 610c2777.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator changed milestone to %initial systemd support · Imported

    changed milestone to %initial systemd support

  • Administrator changed target branch from master to master_staging_systemd · Imported

    changed target branch from master to master_staging_systemd

    By clayton craft on 2024-07-23T22:21:34

    • Author Owner
      Resolved by Administrator

      I'm not really sure that this is working as it should... for example:

      (156/299) Installing systemd-timesyncd (256-r2)
      Executing systemd-timesyncd-256-r2.post-install
      Created symlink '/etc/systemd/system/dbus-org.freedesktop.timesync1.service' → '/usr/lib/systemd/system/systemd-timesyncd.service'.
      Created symlink '/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service' → '/usr/lib/systemd/system/systemd-timesyncd.service'.
      ...
      (160/299) Installing postmarketos-base-systemd (2-r0)
      • systemd-timesyncd has systemctl preset timesyncd in its post-install

      • postmarketos-base-systemd installs the systemd preset file for enabling timesyncd

      • systemd-timesyncd is being installed before pmos-base-systemd because the latter depends on the former. So when the post-install runs systemctl preset ..., there's no preset file installed for explicitly enabling timesyncd

      • I'm actually not sure why the service is still enabled in the example above... I thought the default preset for services was to disable them?

      By clayton craft on 2024-07-24T23:03:41

      Edited by Ghost User
  • Administrator added 139 commits · Imported

    added 139 commits

    • 6544e402...7e1a4d3e - 117 commits from branch master_staging_systemd
    • 7e1a4d3e...74fff945 - 12 earlier commits
    • 707b1842 - main/postmarketos-base-ui: add -systemd subpackage
    • e03008f0 - systemd/postmarketos-base-systemd: add preset
    • 2bf3ca95 - main/postmarketos-ui-phosh: use systemd presets
    • 5ecddc5b - main/postmarketos-base-ui-gnome: use systemd presets
    • bfbc03d1 - systemd/alpine-base: add systemd macros for package install scripts
    • b547bd79 - DO NOT MERGE systemd/systemd-service: add post-install/pre-deinstall support
    • e313564d - squash! systemd/networkmanager: remove some alpine-isms and use $systemd_system_services
    • cb99afd4 - squash! systemd/gnome-keyring: use systemd_user_services
    • 634ee151 - squash! systemd/systemd: use systemd_system_services
    • 8c1fa4f1 - squash! systemd/postmarketos-base-systemd: add preset

    Compare with previous version

    By clayton craft on 2024-07-23T23:23:59

  • Administrator changed the description · Imported

    changed the description

    By clayton craft on 2024-07-23T23:35:47

  • Administrator mentioned in merge request pmbootstrap!2383 (merged) · Imported

    mentioned in merge request pmbootstrap!2383 (merged)

    By clayton craft on 2024-07-24T20:37:59

  • Administrator added 25 commits · Imported

    added 25 commits

    • 8c1fa4f1...4309b124 - 3 commits from branch master_staging_systemd
    • 4309b124...99d65e27 - 12 earlier commits
    • ef19a026 - main/postmarketos-base-ui: add -systemd subpackage
    • b790f57a - systemd/postmarketos-base-systemd: add preset
    • 02b3062f - main/postmarketos-ui-phosh: use systemd presets
    • 1ae090d4 - main/postmarketos-base-ui-gnome: use systemd presets
    • 3b50e0a7 - systemd/alpine-base: add systemd macros for package install scripts
    • 6b754d60 - squash! systemd/gnome-keyring: use systemd_user_services
    • f3215470 - squash! systemd/systemd: use systemd_system_services
    • 1b765d07 - squash! systemd/postmarketos-base-systemd: add preset
    • 21a54b74 - squash! systemd/systemd-services: use systemd_{system,user}_services
    • f1cb7d54 - squash! systemd/networkmanager: use $systemd_system_services

    Compare with previous version

    By clayton craft on 2024-07-24T23:02:13

  • Administrator changed the description · Imported

    changed the description

    By clayton craft on 2024-07-24T23:02:52

  • Administrator resolved all threads · Imported

    resolved all threads

    By clayton craft on 2024-07-24T23:03:41

  • Administrator added 1 commit · Imported

    added 1 commit

    • f44085ef - squash! systemd/gdm: use systemd_system_services

    Compare with previous version

    By clayton craft on 2024-07-24T23:16:36

  • Administrator added 1 commit · Imported

    added 1 commit

    • 7035e62f - squash! systemd/gnome-session: split -service subpackage

    Compare with previous version

    By clayton craft on 2024-07-25T18:29:49

  • Administrator added 2 commits · Imported

    added 2 commits

    • 4ea24525 - squash! systemd/gdm: use systemd_system_services
    • 9aae4a0b - squash! systemd/gnome-session: split -service subpackage

    Compare with previous version

    By clayton craft on 2024-07-25T18:30:05

  • Administrator
  • Administrator
  • Author Owner

    Overall this looks really amazing! Thanks for working through all of this, I think it's really paid off here.

    By Caleb Connolly on 2024-07-26T20:33:11

  • Administrator
    • Author Owner
      Resolved by Administrator

      I have one random idea: can we adjust the abuild patch to depend on postmarketos-base-systemd (or some kind of virtual like systemd-presets and systemd-macros) in default_systemd?

      By jane400 on 2024-07-31T18:24:28

      Edited by Ghost User
  • Administrator added 8 commits · Imported

    added 8 commits

    • 90dd3926 - systemd/alpine-base: add systemd macros for package install scripts
    • 1ded5deb - squash! systemd/gnome-keyring: use systemd_user_services
    • f2c9039c - squash! systemd/systemd: use systemd_system_services
    • 9c2a4b34 - squash! systemd/postmarketos-base-systemd: add preset
    • 973f1521 - squash! systemd/systemd-services: use systemd_{system,user}_services
    • baa80fb1 - squash! systemd/networkmanager: use $systemd_system_services
    • dbe67678 - squash! systemd/gdm: use systemd_system_services
    • b65a100c - squash! systemd/gnome-session: split -service subpackage

    Compare with previous version

    By clayton craft on 2024-07-29T20:28:22

  • Administrator added 4 commits · Imported

    added 4 commits

    • 593a8118 - squash! systemd/systemd-services: use systemd_{system,user}_services
    • c2e5c939 - squash! systemd/networkmanager: use $systemd_system_services
    • 88e95c04 - squash! systemd/gdm: use systemd_system_services
    • c0397cf0 - squash! systemd/gnome-session: split -service subpackage

    Compare with previous version

    By clayton craft on 2024-07-29T20:48:24

  • Administrator added 170 commits · Imported

    added 170 commits

    • c0397cf0...9dbbc72d - 146 commits from branch master_staging_systemd
    • 9dbbc72d...30857761 - 14 earlier commits
    • 12704cab - main/postmarketos-ui-phosh: use systemd presets
    • cd460fd6 - main/postmarketos-base-ui-gnome: use systemd presets
    • 8020a0d9 - systemd/alpine-base: add systemd macros for package install scripts
    • bdfdd61e - squash! systemd/gnome-keyring: use systemd_user_services
    • 208f9315 - squash! systemd/systemd: use systemd_system_services
    • 9e03c661 - squash! systemd/postmarketos-base-systemd: add preset
    • 6c7a8316 - squash! systemd/systemd-services: use systemd_{system,user}_services
    • edac6986 - squash! systemd/networkmanager: use $systemd_system_services
    • 162c8292 - squash! systemd/gdm: use systemd_system_services
    • 6a52fe6a - squash! systemd/gnome-session: split -service subpackage

    Compare with previous version

    By clayton craft on 2024-07-29T22:10:47

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading