diff --git a/debian/changelog b/debian/changelog index 529b9979..015dafff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.521) UNRELEASED; urgency=medium + + * In subiquity image, mount additional squashfs in /media. + + -- Dimitri John Ledkov Wed, 11 Apr 2018 14:19:34 +0200 + livecd-rootfs (2.520) bionic; urgency=medium * Make lzma initramfs compression opt-in rather than opt-out, and do not 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/lib/systemd/system/local-fs.target.wants/media-filesystem.mount new file mode 120000 index 00000000..0a663081 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount @@ -0,0 +1 @@ +../media-filesystem.mount \ No newline at end of file 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/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount new file mode 120000 index 00000000..5aa5c72d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount @@ -0,0 +1 @@ +../media-rack.lower.mount \ No newline at end of file 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/lib/systemd/system/local-fs.target.wants/media-rack.mount new file mode 120000 index 00000000..35236752 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount @@ -0,0 +1 @@ +../media-rack.mount \ No newline at end of file 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/lib/systemd/system/local-fs.target.wants/media-region.lower.mount new file mode 120000 index 00000000..6a2b1af4 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount @@ -0,0 +1 @@ +../media-region.lower.mount \ No newline at end of file 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/lib/systemd/system/local-fs.target.wants/media-region.mount new file mode 120000 index 00000000..f4a748da --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount @@ -0,0 +1 @@ +../media-region.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount new file mode 100644 index 00000000..13fe2e1f --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/filesystem.squashfs +Where=/media/filesystem +Type=squashfs +Options=ro 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/lib/systemd/system/media-rack.lower.mount new file mode 100644 index 00000000..8d1079f8 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/maas/maas-rack.squashfs +Where=/media/rack.lower +Type=squashfs +Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount new file mode 100644 index 00000000..90de99d5 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount @@ -0,0 +1,9 @@ +[Unit] +After=media-filesystem.mount +After=media-rack.lower.mount + +[Mount] +What=overlay +Where=/media/rack +Type=overlay +Options=lowerdir=/media/rack.lower:/media/filesystem 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/lib/systemd/system/media-region.lower.mount new file mode 100644 index 00000000..ee220c0d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount @@ -0,0 +1,5 @@ +[Mount] +What=/cdrom/casper/maas/maas-region.squashfs +Where=/media/region.lower +Type=squashfs +Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount new file mode 100644 index 00000000..7a52efff --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount @@ -0,0 +1,10 @@ +[Unit] +After=media-filesystem.mount +After=media-rack.lower.mount +After=media-region.lower.mount + +[Mount] +What=overlay +Where=/media/region +Type=overlay +Options=lowerdir=/media/region.lower:/media/rack.lower:/media/filesystem