If lxc-debian fails or is interrupted during debootstrap then the next
invocation of lxc-debian breaks because it only checks for the existence
of the directory. This forces the user to remove the cache by hand to
retry the create step.
Let's allow the user to re-run lxc-debian to resume/retry. Store the
cache in a partial-$ARCH directory until debootstrap succeeds. Then move
the valid cache to its final destination.
Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx>
---
scripts/lxc-debian.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: lxc/scripts/lxc-debian.in
===================================================================
--- lxc.orig/scripts/lxc-debian.in
+++ lxc/scripts/lxc-debian.in
@@ -217,19 +217,20 @@ create() {
echo "not cached"
- mkdir -p "$CACHE/rootfs-$ARCH"
+ mkdir -p "$CACHE/partial-$ARCH"
# download a mini debian into a cache
echo "Downloading debian minimal ..."
debootstrap --verbose --variant=minbase --arch=$ARCH \
--include apache,netbase,net-tools,iproute,openssh-server \
- etch $CACHE/rootfs-$ARCH http://ftp.debian.org/debian
+ etch $CACHE/partial-$ARCH http://ftp.debian.org/debian
RESULT=$?
if [ "$RESULT" != "0" ]; then
echo "Failed to download the rootfs, aborting."
exit 1
fi
+ mv "$CACHE/partial-$ARCH" "$CACHE/rootfs-$ARCH"
echo "Download complete."
else
echo "Found."
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
