[lxc-devel] lxc-create: file-based capabilities are lost

[Serge E. Hallyn]

Quoting Harald Dunkel (harald.dunkel at aixigo.de):
> Hi Serge,
> 
> On 06/14/16 17:10, Serge E. Hallyn wrote:
> > 
> > Well I notice that copy_debian() rsyncs without -X.  Does
> > adding -X fix it for you?
> 
> Using "rsync -SHaAX" in lxc-debian it works (on Jessie).
> Attached you can find a suggested patch for all (lxc 1.1.5).

Thanks this looks good.  Do you mind sending a signed-off-by?

> Thanx for your help
> Harri
> 

> Index: lxc-1.1.5.1/templates/lxc-altlinux.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-altlinux.in
> +++ lxc-1.1.5.1/templates/lxc-altlinux.in
> @@ -208,7 +208,7 @@ copy_altlinux()
>      #cp -a $cache/rootfs-$arch $rootfs_path || return 1
>      # i prefer rsync (no reason really)
>      mkdir -p $rootfs_path
> -    rsync -Ha $cache/rootfs/ $rootfs_path/
> +    rsync -SHaAX $cache/rootfs/ $rootfs_path/
>      return 0
>  }
>  
> Index: lxc-1.1.5.1/templates/lxc-centos.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-centos.in
> +++ lxc-1.1.5.1/templates/lxc-centos.in
> @@ -512,7 +512,7 @@ copy_centos()
>      #cp -a $cache/rootfs-$arch $rootfs_path || return 1
>      # i prefer rsync (no reason really)
>      mkdir -p $rootfs_path
> -    rsync -a $cache/rootfs/ $rootfs_path/
> +    rsync -SHaAX $cache/rootfs/ $rootfs_path/
>      echo
>      return 0
>  }
> Index: lxc-1.1.5.1/templates/lxc-debian.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-debian.in
> +++ lxc-1.1.5.1/templates/lxc-debian.in
> @@ -283,7 +283,7 @@ copy_debian()
>      # make a local copy of the minidebian
>      echo -n "Copying rootfs to $rootfs..."
>      mkdir -p $rootfs
> -    rsync -Ha "$cache/rootfs-$release-$arch"/ $rootfs/ || return 1
> +    rsync -SHaAX "$cache/rootfs-$release-$arch"/ $rootfs/ || return 1
>      return 0
>  }
>  
> Index: lxc-1.1.5.1/templates/lxc-fedora.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-fedora.in
> +++ lxc-1.1.5.1/templates/lxc-fedora.in
> @@ -641,7 +641,7 @@ This will take a couple of minutes.  Pat
>  
>      echo "Creating Stage 1 r/w copy of r/o Stage 0 squashfs image from LiveOS."
>  
> -    rsync -aAHS stage0/. stage1/
> +    rsync -aAHSX stage0/. stage1/
>  
>      umount stage0
>      umount squashfs
> @@ -1015,7 +1015,7 @@ copy_fedora()
>      #cp -a $cache/rootfs-$basearch $rootfs_path || return 1
>      # i prefer rsync (no reason really)
>      mkdir -p $rootfs_path
> -    rsync -Ha $cache/rootfs/ $rootfs_path/
> +    rsync -SHaAX $cache/rootfs/ $rootfs_path/
>      echo
>      return 0
>  }
> Index: lxc-1.1.5.1/templates/lxc-openmandriva.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-openmandriva.in
> +++ lxc-1.1.5.1/templates/lxc-openmandriva.in
> @@ -155,7 +155,7 @@ copy_openmandriva()
>  
>      echo -n "Copying rootfs to $rootfs_path ..."
>      mkdir -p $rootfs_path
> -    rsync -Ha $cache/rootfs/ $rootfs_path/
> +    rsync -SHaAX $cache/rootfs/ $rootfs_path/
>      return 0
>  }
>  
> Index: lxc-1.1.5.1/templates/lxc-opensuse.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-opensuse.in
> +++ lxc-1.1.5.1/templates/lxc-opensuse.in
> @@ -221,7 +221,7 @@ copy_opensuse()
>      # make a local copy of the mini opensuse
>      echo "Copying rootfs to $rootfs ..."
>      mkdir -p $rootfs
> -    rsync -Ha $cache/rootfs-$arch/ $rootfs/ || return 1
> +    rsync -SHaAX $cache/rootfs-$arch/ $rootfs/ || return 1
>      return 0
>  }
>  
> Index: lxc-1.1.5.1/templates/lxc-ubuntu.in
> ===================================================================
> --- lxc-1.1.5.1.orig/templates/lxc-ubuntu.in
> +++ lxc-1.1.5.1/templates/lxc-ubuntu.in
> @@ -413,7 +413,7 @@ copy_ubuntu()
>        btrfs subvolume snapshot $cache/rootfs-$arch $realrootfs || return 1
>        [ "$rootfs" = "$realrootfs" ] || mount --bind $realrootfs $rootfs || return 1
>      else
> -      rsync -Ha $cache/rootfs-$arch/ $rootfs/ || return 1
> +      rsync -SHaAX $cache/rootfs-$arch/ $rootfs/ || return 1
>      fi
>      return 0
>  }

> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel