Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
On Thu, 15 Mar 2018, Benjamin Drung wrote: > I have finally tested git master and found one missing rename of > /live/overlay (probably caused by applying my patches in a different > order which causes merge conflicts). See > https://salsa.debian.org/live-team/live-boot/merge_requests/6 > for a fix. Merged, thanks. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Am Freitag, den 23.02.2018, 19:24 +0100 schrieb Raphael Hertzog: > Hello, > > On Fri, 05 Jan 2018, intrigeri wrote: > > Benjamin Drung: > > > Therefore move /lib/live/mount to /run/live and skip the > > > intermedia > > > /live mount points. This reduces code and complexity. > > > > As someone who had to repeatedly bang his head against exactly this > > part of the live-boot code (last time earlier this week), I can > > only > > agree with the proposed simplification idea. I didn't do a full > > code > > review though. > > I'm not familiar enough with this part either and I am unlikely to > find > any obvious mistake. But I committed the patch anyway > > It would be nice if we could test the live-boot in git before I > upload > it. I have finally tested git master and found one missing rename of /live/overlay (probably caused by applying my patches in a different order which causes merge conflicts). See https://salsa.debian.org/live-team/live-boot/merge_requests/6 for a fix. > Benjamin, did you test your changes with persistence enabled? No, I haven't. Thanks for everyone else who does. Am Dienstag, den 13.03.2018, 13:05 + schrieb Luca Boccassi: > On Tue, 2018-03-13 at 10:49 +0100, Raphael Hertzog wrote: > > On Mon, 12 Mar 2018, Luca Boccassi wrote: > > > Or maybe have a backward-compatible symlinks? > > > > This seems entirely reasonable. Can you work on this? > > Yes no problem, I'll give it a shot and send a PR for review before > the > end of the week. Thanks for doing it. I will be happy to review it. -- Benjamin Drung System Developer Debian & Ubuntu Developer ProfitBricks GmbH Greifswalder Str. 207 D - 10405 Berlin Email: benjamin.dr...@profitbricks.com URL: https://www.profitbricks.de Sitz der Gesellschaft: Berlin Registergericht: Amtsgericht Charlottenburg, HRB 125506 B Geschäftsführer: Achim Weiss, Matthias Steinberg
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
On Tue, 2018-03-13 at 15:05 +0100, Raphael Hertzog wrote: > Hi, > > On Tue, 13 Mar 2018, Luca Boccassi wrote: > > > > Or maybe have a backward-compatible symlinks? > > > > > > This seems entirely reasonable. Can you work on this? > > > > Yes no problem, I'll give it a shot and send a PR for review before > > the > > end of the week. > > Great. > > > > BTW, given your vested interested in the various live tools, > > > would > > > you like to join the maintenance team? > > > > Certainly, I'm more than happy to help! We use the live tools in > > our > > derivative (Vyatta) so I can dedicate time at work to it. > > I have added you to the live-team group on salsa as master. Welcome > on > board! > > Use your best judgment when merging someone's else work and ask for > review > when you have doubts about your own work. And tested code is always > better > ;-) > > Cheers, Great, will do, thank you very much! -- Kind regards, Luca Boccassi signature.asc Description: This is a digitally signed message part
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Hi, On Tue, 13 Mar 2018, Luca Boccassi wrote: > > > Or maybe have a backward-compatible symlinks? > > > > This seems entirely reasonable. Can you work on this? > > Yes no problem, I'll give it a shot and send a PR for review before the > end of the week. Great. > > BTW, given your vested interested in the various live tools, would > > you like to join the maintenance team? > > Certainly, I'm more than happy to help! We use the live tools in our > derivative (Vyatta) so I can dedicate time at work to it. I have added you to the live-team group on salsa as master. Welcome on board! Use your best judgment when merging someone's else work and ask for review when you have doubts about your own work. And tested code is always better ;-) Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
On Tue, 2018-03-13 at 10:49 +0100, Raphael Hertzog wrote: > Hi, > > On Mon, 12 Mar 2018, Luca Boccassi wrote: > > That is certainly the case for myself at $work - we have a lot of > > scripts to deal with installing images, I've tested it, > > and > > they all break due to this change. In my case it's a derivative > > with > > proprietary bits, so I understand if that is treated as less > > important. > > But would it be possible to make this change optional, please? > > Making this change optional would not be logical. It would complexify > the > code to support two different layouts when the goal was to simplify > it. Ok, makes sense. > > Or maybe have a backward-compatible symlinks? > > This seems entirely reasonable. Can you work on this? Yes no problem, I'll give it a shot and send a PR for review before the end of the week. > BTW, given your vested interested in the various live tools, would > you > like to join the maintenance team? > > Myself I am working on live tools only because I need them for the > derivative I work on (Kali) and it would be nice to share the > workload > with other people. Certainly, I'm more than happy to help! We use the live tools in our derivative (Vyatta) so I can dedicate time at work to it. -- Kind regards, Luca Boccassi signature.asc Description: This is a digitally signed message part
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Hi, On Mon, 12 Mar 2018, Luca Boccassi wrote: > That is certainly the case for myself at $work - we have a lot of > scripts to deal with installing images, I've tested it, and > they all break due to this change. In my case it's a derivative with > proprietary bits, so I understand if that is treated as less important. > But would it be possible to make this change optional, please? Making this change optional would not be logical. It would complexify the code to support two different layouts when the goal was to simplify it. > Or maybe have a backward-compatible symlinks? This seems entirely reasonable. Can you work on this? BTW, given your vested interested in the various live tools, would you like to join the maintenance team? Myself I am working on live tools only because I need them for the derivative I work on (Kali) and it would be nice to share the workload with other people. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Hello, On Fri, 05 Jan 2018, intrigeri wrote: > Benjamin Drung: > > Therefore move /lib/live/mount to /run/live and skip the intermedia > > /live mount points. This reduces code and complexity. > > As someone who had to repeatedly bang his head against exactly this > part of the live-boot code (last time earlier this week), I can only > agree with the proposed simplification idea. I didn't do a full code > review though. I'm not familiar enough with this part either and I am unlikely to find any obvious mistake. But I committed the patch anyway It would be nice if we could test the live-boot in git before I upload it. Benjamin, did you test your changes with persistence enabled? To whoever is following, please test and report back. Thank you. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Hi, Benjamin Drung: > Therefore move /lib/live/mount to /run/live and skip the intermedia > /live mount points. This reduces code and complexity. As someone who had to repeatedly bang his head against exactly this part of the live-boot code (last time earlier this week), I can only agree with the proposed simplification idea. I didn't do a full code review though. Cheers, -- intrigeri
Bug#886328: live-boot: Please use /run/live instead of /lib/live/mount
Source: live-boot
Version: 1:20170623
Severity: normal
Tags: patch
Currently live-boot mounts following things:
/lib/live/mount/medium: the live media mounted read-only
/lib/live/mount/rootfs/filesystem.{squashfs,ext*,...}: the root fs image
/lib/live/mount/overlay: the copy-on-write content from aufs
/lib/live/mount/findiso: the loop-mounted iso image when using findiso
/lib/live/mount/persistence/*: persistent devices with copy-on-write overlay
Some of these mounts are mounted in /live before they are moved to their
correct place. Since the final root filesystem is mounted in /root and
run-init switches to it, special care needs to be taken when moving the
mount points around.
/lib/live/mount/overlay is not accessible any more in the live system:
$ df -h
/dev/loop0 169M 169M 0 100% /lib/live/mount/rootfs/root.squashfs
tmpfs 744M 0 744M 0% /lib/live/mount/overlay
overlay1,5G 1001M 536M 66% /
The early initramfs stage mounts tmpfs on /run which doesn't need to be
moved once the final root filesystem is in place. The mount points do
not need much space and can live on /run/live without problems. Since
these mount points are run-time variable data, they fit perfectly for
/run and comply with FHS 3.0.
Therefore move /lib/live/mount to /run/live and skip the intermedia
/live mount points. This reduces code and complexity. A tested patch is
attached.
See also for the previous larger layout change:
https://lists.debian.org/debian-live/2012/10/msg00021.html
--
Benjamin Drung
System Developer
Debian & Ubuntu Developer
ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin
Email: benjamin.dr...@profitbricks.com
URL: https://www.profitbricks.de
Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg
>From 3f97c0d3153c2073eb93473eeb26d2f8153f6464 Mon Sep 17 00:00:00 2001
From: Benjamin Drung
Date: Thu, 4 Jan 2018 11:02:32 +0100
Subject: [PATCH] Use /run/live instead of /lib/live/mount
Currently live-boot mounts following things:
/lib/live/mount/medium: the live media mounted read-only
/lib/live/mount/rootfs/filesystem.{squashfs,ext*,...}: the root fs image
/lib/live/mount/overlay: the copy-on-write content from aufs
/lib/live/mount/findiso: the loop-mounted iso image when using findiso
/lib/live/mount/persistence/*: persistent devices with copy-on-write overlay
Some of these mounts are mounted in /live before they are moved to their
correct place. Since the final root filesystem is mounted in /root and
run-init switches to it, special care needs to be taken when moving the
mount points around.
/lib/live/mount/overlay is not accessible any more in the live system:
$ df -h
/dev/loop0 169M 169M 0 100% /lib/live/mount/rootfs/root.squashfs
tmpfs 744M 0 744M 0% /lib/live/mount/overlay
overlay1,5G 1001M 536M 66% /
The early initramfs stage mounts tmpfs on /run which doesn't need to be
moved once the final root filesystem is in place. The mount points do
not need much space and can live on /run/live without problems. Since
these mount points are run-time variable data, they fit perfectly for
/run and comply with FHS 3.0.
Therefore move /lib/live/mount to /run/live and skip the intermedia
/live mount points. This reduces code and complexity.
See also for the previous larger layout change:
https://lists.debian.org/debian-live/2012/10/msg00021.html
Signed-off-by: Benjamin Drung
---
backend/initramfs-tools/live.hook | 2 +-
components/0001-init-vars.sh | 2 +-
components/2010-remove-persistence | 2 +-
components/9990-main.sh| 20 +++
components/9990-misc-helpers.sh| 24 +++---
components/9990-overlay.sh | 41 +++---
6 files changed, 25 insertions(+), 66 deletions(-)
diff --git a/backend/initramfs-tools/live.hook
b/backend/initramfs-tools/live.hook
index 1ce922d..97f4c5e 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -8,7 +8,7 @@ set -e
# Reading configuration file from filesystem and live-media
for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-/lib/live/mount/media/live/boot.conf
/lib/live/mount/media/live/boot/*
+/run/live/medium/live/boot.conf /run/live/medium/live/boot/*
do
if [ -e "${_FILE}" ]
then
diff --git a/components/0001-init-vars.sh b/components/0001-init-vars.sh
index 7e69956..603cf43 100755
--- a/components/0001-init-vars.sh
+++ b/components/0001-init-vars.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-mountpoint="/live/medium"
+mountpoint="/run/live/medium"
alt_mountpoint="/media"
LIVE_MEDIA_PATH="live"
HOSTNAME="host"
diff --git a/components/2010-remove-persistence
b/components/2010-remove-persistence
index 5dcf0c0..717a408 100755
--- a/components/2010-remove-persistence
+++
