(mirror of https://github.com/vyos/vyos-live-build.git) https://git.amelek.net/vyos/vyos-live-build.git/atom?h=debian%2F3.0_a42-1 2012-01-12T21:22:57+00:00 2012-01-12T21:22:57+00:00 Colin Watson cjwatson@ubuntu.com 2012-01-12T21:22:57+00:00 urn:sha1:3a75594b8c2590f7512702af390af0b5ff7bb4ea 2012-01-12T11:34:53+00:00 Daniel Baumann daniel@debian.org 2012-01-12T11:34:53+00:00 urn:sha1:dce7b385ba4bafa8d2d31b7cce45d347db263dba 2012-01-12T10:57:45+00:00 Daniel Baumann daniel@debian.org 2012-01-12T10:57:45+00:00 urn:sha1:2eab8fec682e896cd5e2c1fd48386d43ce6f0139 2012-01-10T20:54:58+00:00 Matthijs Kooijman matthijs@stdin.nl 2012-01-10T20:37:20+00:00 urn:sha1:93a18b9cadf66d364ee10b8b85d1c92d0f924872 2012-01-10T20:54:58+00:00 Matthijs Kooijman matthijs@stdin.nl 2012-01-10T20:01:06+00:00 urn:sha1:58209e8bd8b7c159c64405cde9e127de54af293f This reverts part of cacf9b6e34 (but also adds a "bind" option to the remount command, as documented in mount(8)). Apparently, doing "mount -o bind,ro" doesn't work. It outputs: mount: warning: chroot/root/config seems to be mounted read-write. and mounts read-write instead of read-only. This behaviour is documented in mount(8). Newer kernels do seem to allow combining bind with the read-only option (see mount(2)), but this does not seem to work (possibly because mount is trying to be smart). 2012-01-10T20:54:58+00:00 Matthijs Kooijman matthijs@stdin.nl 2012-01-10T19:11:52+00:00 urn:sha1:e7ecf56be3df3623bb3e78a85598f74dbd08b6a0 Previously, the config was bindmounted inside the chroot only for hooks from the config dir, now it is done earlier so it is available for all hooks. Note that it is now also done if there are no hooks, but this is probably enough of an exception case to not warrant the extra plumbing required to detect the case (and doing an extra bindmount shouldn't really hurt anyway...). 2012-01-10T20:54:58+00:00 Matthijs Kooijman matthijs@stdin.nl 2012-01-10T18:38:02+00:00 urn:sha1:ea491a1a1a81fecfe43ff02a9a627a9f9a9eea85 lb_chroot_hooks would copy the hooks to run to chroot/root/lb_chroot_hooks, but then try to run them from chroot/root (which obviously fails). This means lb_chroot_hooks has not been working for hooks from /usr/share/live/build/hooks since lb_chroot_hooks was added in revision e4793268. Running hooks from the config directory was unaffected. 2012-01-10T20:54:58+00:00 Matthijs Kooijman matthijs@stdin.nl 2012-01-10T13:44:42+00:00 urn:sha1:dbe6a82bc031ecc8d9ba4230350bdd6277f905f6 Apparently, dash doesn't expand shell patterns within a quoted string, whereas bash does. We can't remove the quoting entirely, though, since that would cause problems when $LB_BASE or $_HOOK contains spaces (note that $_HOOK can probably never contain spaces, but let's handle it just in case). Only quoting the expansion of $LB_BASE and $_HOOK, but not the shell pattern should make the hooks work with both bash and dash again. 2012-01-07T19:25:54+00:00 Daniel Baumann daniel@debian.org 2012-01-07T19:25:54+00:00 urn:sha1:ecbcdaa7849b4751ebd400f66b5d290874254f54 2012-01-07T19:18:43+00:00 Daniel Baumann daniel@debian.org 2012-01-07T19:18:43+00:00 urn:sha1:6bb4a22152570c4ca2d48d9efb94b5a0349c159b