1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-14 20:09:49 +03:00
Commit graph

4 commits

Author SHA1 Message Date
Caleb Connolly
a5617cb110
pmb/data/merge-usr: relative symlink targets (MR 2402)
Make sure the symlinks are correct when not inside the chroot, they
should be relative!

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
2024-09-18 13:34:13 +02:00
Oliver Smith
94d917681e
pmb/data/merge-usr: fix cannot overwrite error (MR 2388)
Don't just run one "mv" command to move everything from source to
target. This fails if the same directory already exists in target.
Instead, go into each directory in source, and move all files inside
that directory into the target directory structure.

Fix the following error:
  mv: cannot overwrite '/home/user/.local/var/pmbootstrap/chroot_native/usr/lib/sysctl.d': Directory not empty
2024-09-17 02:27:45 +02:00
Oliver Smith
9a50d3398d
pmb/data/merge-usr: deduplicate code (MR 2388)
Create a common merge() function that can be adjusted in the next patch,
because the logic for merging needs to be more complicated now.
2024-09-17 02:27:45 +02:00
Oliver Smith
6f3ed45d49
systemd installs: merge /usr on chroot init (MR 2273) 2024-03-12 23:53:47 +00:00