Browse Source

Merge #135: Fixes Debian jessie lxc-init path issue

543e0d5 Check existence of lxc-init before cp to init.lxc (Kevin Gallagher)
pull/141/head
Devrandom 4 years ago
parent
commit
ad3f9cc4c2
No account linked to committer's email address
1 changed files with 8 additions and 2 deletions
  1. 8
    2
      bin/make-base-vm

+ 8
- 2
bin/make-base-vm View File

@@ -193,9 +193,15 @@ if [ $LXC = "1" ]; then
else
if [ $ARCH = "amd64" ]
then
sudo cp $OUT-bootstrap/usr/lib/x86_64-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc
if [ -f $OUT-bootstrap/usr/lib/x86_64-linux-gnu/lxc/lxc-init ]
then
sudo cp $OUT-bootstrap/usr/lib/x86_64-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc
fi
else
sudo cp $OUT-bootstrap/usr/lib/i386-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc
if [ -f $OUT-bootstrap/usr/lib/i386-linux-gnu/lxc/lxc-init ]
then
sudo cp $OUT-bootstrap/usr/lib/i386-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc
fi
fi
fi
dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=10240

Loading…
Cancel
Save