Move overlay include.binary /lib to /usr/lib.

2025-03-25 09:51:23 +00:00 · 2018-11-13 11:25:52 +00:00 · 2018-11-13 11:25:52 +00:00 · 75b9ab1664
commit 75b9ab1664
parent 93df6705a0
20 changed files with 2 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,8 +1,9 @@
-livecd-rootfs (2.546~ppa1) disco; urgency=medium
+livecd-rootfs (2.546) disco; urgency=medium

  * Revert "Do not mount result, on top of lowerdir, appears to fail in
    disco." the actual problem is in live-build with merged-usr and
    copying over chroot/binary includes.
+  * Move overlay include.binary /lib to /usr/lib.

 -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 12 Nov 2018 20:37:51 +0000

--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.lower.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.lower.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online