From 8630ad1530f85c57a96f998e7251ee27c9cf267c Mon Sep 17 00:00:00 2001 From: Maxim Kulkin Date: Thu, 2 Jul 2015 15:16:33 -0700 Subject: [PATCH] Fix dockerize-disk.sh working in non-en locale One part of script relies on messages that are output by some system tool. In non-en locale those messages get localized which breaks the script. This patch enforces en locale for that system tool. Signed-off-by: Maxim Kulkin --- contrib/dockerize-disk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/dockerize-disk.sh b/contrib/dockerize-disk.sh index 6e72d9fa40..444e243abe 100755 --- a/contrib/dockerize-disk.sh +++ b/contrib/dockerize-disk.sh @@ -74,7 +74,7 @@ mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/auf # Update files cd $builddir -diff -rq disk_image workdir \ +LC_ALL=C diff -rq disk_image workdir \ | sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \ | while read action entry; do case "$action" in