On 12-09-12 02:15 PM, Stuart Yoder wrote:
> From: Stuart Yoder <stuart.yo...@freescale.com>
> 
> Signed-off-by: Stuart Yoder <stuart.yo...@freescale.com>
> ---
> 
> -in our embedded ppc distro we have the other lib
>  dirs but no /usr/lib (for a 64-bit rootfs).  This
>  template currently breaks because of that.
> 
>  templates/lxc-busybox.in |   29 +++++++++++------------------
>  1 file changed, 11 insertions(+), 18 deletions(-)
> 
> diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
> index ef356db..a94eaa3 100644
> --- a/templates/lxc-busybox.in
> +++ b/templates/lxc-busybox.in
> @@ -235,24 +235,17 @@ lxc.pts = 1
>  lxc.rootfs = $rootfs
>  EOF
>  
> -if [ -d "$rootfs/lib" ]; then
> -cat <<EOF >> $path/config
> -lxc.mount.entry=/lib $rootfs/lib none ro,bind 0 0
> -lxc.mount.entry=/usr/lib $rootfs/usr/lib none ro,bind 0 0
> -EOF
> -fi
> -
> -if [ -d "/lib64" ] && [ -d "$rootfs/lib64" ]; then
> -cat <<EOF >> $path/config
> -lxc.mount.entry=/lib64 $rootfs/lib64 none ro,bind 0 0
> -EOF
> -fi
> -
> -if [ -d "/usr/lib64" ] && [ -d "$rootfs/usr/lib64" ]; then
> -cat <<EOF >> $path/config
> -lxc.mount.entry=/usr/lib64 $rootfs/usr/lib64 none ro,bind 0 0
> -EOF
> -fi
> +    libdirs="\
> +        /lib \
> +        /usr/lib \
> +        /lib64 \
> +        /usr/lib64"
> +
> +    for dir in $libdirs; do
> +        if [ -d $dir ] && [ -d "$rootfs$dir" ]; then
> +            echo "lxc.mount.entry=$dir $rootfs$dir none ro,bind 0 0" >> 
> $path/config
> +        fi
> +    done
>  }
>  
>  usage()

Thanks for the patch, I'll apply it to the staging tree in a minute with
a minor change.
The current implementation seems to use absolute paths as the target
(/var/lib/lxc/<name>/rootfs/<path>) which isn't recommended as it's
making cloning a container much harder.

Instead, lxc now supports relative mounts, for example:
lxc.mount.entry=/usr/lib usr/lib none ro,bind 0 0

Thanks for your contribution

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel

Reply via email to