# HG changeset patch # User Stanislas Leduc # Date 1387624607 -3600 # Node ID a949dd818ac62d0265503056fb4bb35d2c0391b3 # Parent 9f83ce181bc013416b31910defb4729f7aeb7686 lxc: use ash shell for lxc-template;fix arch command, use (uname -m) diff -r 9f83ce181bc0 -r a949dd818ac6 debootstrap/receipt --- a/debootstrap/receipt Sat Dec 21 11:19:27 2013 +0100 +++ b/debootstrap/receipt Sat Dec 21 12:16:47 2013 +0100 @@ -9,7 +9,7 @@ WEB_SITE="https://wiki.debian.org/Debootstrap" WGET_URL="http://people.slitaz.org/~shann/packages/$PACKAGE/$TARBALL" -DEPENDS="dpkg" +DEPENDS="dpkg tar" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 9f83ce181bc0 -r a949dd818ac6 lxc/receipt --- a/lxc/receipt Sat Dec 21 11:19:27 2013 +0100 +++ b/lxc/receipt Sat Dec 21 12:16:47 2013 +0100 @@ -33,12 +33,13 @@ $fs/usr/bin/lxc-version $fs/usr/bin/lxc-netstat \ $fs/usr/bin/lxc-destroy $fs/usr/bin/lxc-create \ $fs/usr/bin/lxc-setcaps $fs/usr/bin/lxc-setuid \ - $fs/usr/bin/lxc-ls + $fs/usr/bin/lxc-ls $fs/usr/lib/lxc/templates/lxc* sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \ -e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \ -e 's/ < 3/ -lt 3/;s/ > 3/ -gt 3/' -e 's|/bin/bash|/bin/ash|' \ $fs/usr/bin/lxc-checkconfig sed -i "s/--preserve-root//" $fs/usr/bin/lxc-destroy $fs/usr/lib/lxc/templates/lxc-* + sed -i "s/(arch)/(uname -m)/" $fs/usr/lib/lxc/templates/lxc-* chmod +x $fs/usr/bin/lxc-* }