diff options
author | Luca Boccassi <bluca@debian.org> | 2023-06-12 03:15:19 +0200 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-28 20:34:03 +0200 |
commit | b0d3095fd6cc1791a38f57a1982116b4475244ba (patch) | |
tree | f415bd813a7e07599c969fdd4965390bfdf38cd6 /test/test-fstab-generator.sh | |
parent | Merge pull request #28551 from mrc0mmand/unit-cleanup-set (diff) | |
download | systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.tar.xz systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.zip |
Drop split-usr and unmerged-usr support
As previously announced, execute order 66:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html
The meson options split-usr, rootlibdir and rootprefix become no-ops
that print a warning if they are set to anything other than the
default values. We can remove them in a future release.
Diffstat (limited to 'test/test-fstab-generator.sh')
-rwxr-xr-x | test/test-fstab-generator.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh index 0c949d46f4..50ba321b9c 100755 --- a/test/test-fstab-generator.sh +++ b/test/test-fstab-generator.sh @@ -59,11 +59,6 @@ test_one() ( touch "$i" done - # For split-usr system - for i in "$out"/systemd-*.service; do - sed -i -e 's:ExecStart=/lib/systemd/:ExecStart=/usr/lib/systemd/:' "$i" - done - if [[ "${input##*/}" =~ \.fstab\.input ]]; then for i in "$out"/*.{automount,mount,swap}; do sed -i -e 's:SourcePath=.*$:SourcePath=/etc/fstab:' "$i" |