From 75b9ab1664a6a0690eae9279acbc53770e501a96 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 13 Nov 2018 11:25:52 +0000 Subject: [PATCH] Move overlay include.binary /lib to /usr/lib. --- debian/changelog | 3 ++- .../lib/systemd/system/getty@.service.d/autologin.conf | 0 .../lib/systemd/system/getty@tty1.service.d/conditional.conf | 0 .../system/local-fs.target.wants/media-filesystem.mount | 0 .../system/local-fs.target.wants/media-rack.lower.mount | 0 .../lib/systemd/system/local-fs.target.wants/media-rack.mount | 0 .../system/local-fs.target.wants/media-region.lower.mount | 0 .../systemd/system/local-fs.target.wants/media-region.mount | 0 .../system/local-fs.target.wants/subiquity_config.mount | 0 .../{ => usr}/lib/systemd/system/media-filesystem.mount | 0 .../{ => usr}/lib/systemd/system/media-rack.lower.mount | 0 .../overlay/{ => usr}/lib/systemd/system/media-rack.mount | 0 .../{ => usr}/lib/systemd/system/media-region.lower.mount | 0 .../overlay/{ => usr}/lib/systemd/system/media-region.mount | 0 .../system/serial-getty@.service.d/subiquity-serial.conf | 0 .../{ => usr}/lib/systemd/system/serial-subiquity@.service | 0 .../snap.subiquity.subiquity-service.service.d/subiquity.conf | 0 .../lib/systemd/system/snapd.service.d/no-reexec.conf | 0 .../{ => usr}/lib/systemd/system/subiquity_config.mount | 0 .../overlay/{ => usr}/lib/systemd/systemd-networkd-wait-online | 0 20 files changed, 2 insertions(+), 1 deletion(-) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/getty@.service.d/autologin.conf (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/getty@tty1.service.d/conditional.conf (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/media-filesystem.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/media-rack.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/media-region.lower.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/media-region.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/local-fs.target.wants/subiquity_config.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/media-filesystem.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/media-rack.lower.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/media-rack.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/media-region.lower.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/media-region.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/serial-subiquity@.service (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/snapd.service.d/no-reexec.conf (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/system/subiquity_config.mount (100%) rename live-build/ubuntu-server/includes.binary/overlay/{ => usr}/lib/systemd/systemd-networkd-wait-online (100%) diff --git a/debian/changelog b/debian/changelog index ff8332ca..8dac96e1 100644 --- 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 Mon, 12 Nov 2018 20:37:51 +0000 diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@.service.d/autologin.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/subiquity_config.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/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 similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snapd.service.d/no-reexec.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity_config.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity_config.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online