wok-stable rev 12427

lxc: use ash shell for lxc-template;fix arch command, use (uname -m)
author Stanislas Leduc <shann@slitaz.org>
date Sat Dec 21 12:16:47 2013 +0100 (2013-12-21)
parents 9f83ce181bc0
children 7ef0801eb21d
files debootstrap/receipt lxc/receipt
line diff
     1.1 --- a/debootstrap/receipt	Sat Dec 21 11:19:27 2013 +0100
     1.2 +++ b/debootstrap/receipt	Sat Dec 21 12:16:47 2013 +0100
     1.3 @@ -9,7 +9,7 @@
     1.4  WEB_SITE="https://wiki.debian.org/Debootstrap"
     1.5  WGET_URL="http://people.slitaz.org/~shann/packages/$PACKAGE/$TARBALL"
     1.6  
     1.7 -DEPENDS="dpkg"
     1.8 +DEPENDS="dpkg tar"
     1.9  
    1.10  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.11  genpkg_rules()
     2.1 --- a/lxc/receipt	Sat Dec 21 11:19:27 2013 +0100
     2.2 +++ b/lxc/receipt	Sat Dec 21 12:16:47 2013 +0100
     2.3 @@ -33,12 +33,13 @@
     2.4  		$fs/usr/bin/lxc-version $fs/usr/bin/lxc-netstat \
     2.5  		$fs/usr/bin/lxc-destroy $fs/usr/bin/lxc-create \
     2.6  		$fs/usr/bin/lxc-setcaps $fs/usr/bin/lxc-setuid \
     2.7 -		$fs/usr/bin/lxc-ls
     2.8 +		$fs/usr/bin/lxc-ls $fs/usr/lib/lxc/templates/lxc*
     2.9  	sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \
    2.10  		-e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \
    2.11  		-e 's/ < 3/ -lt 3/;s/ > 3/ -gt 3/' -e 's|/bin/bash|/bin/ash|' \
    2.12  		$fs/usr/bin/lxc-checkconfig
    2.13  	sed -i "s/--preserve-root//" $fs/usr/bin/lxc-destroy $fs/usr/lib/lxc/templates/lxc-*
    2.14 +	sed -i "s/(arch)/(uname -m)/" $fs/usr/lib/lxc/templates/lxc-*
    2.15  	chmod +x $fs/usr/bin/lxc-*
    2.16  }
    2.17