Skip to content

Commit 8630ad1

Browse files
author
Maxim Kulkin
committed
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 <[email protected]>
1 parent 9356c76 commit 8630ad1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/dockerize-disk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/auf
7474

7575
# Update files
7676
cd $builddir
77-
diff -rq disk_image workdir \
77+
LC_ALL=C diff -rq disk_image workdir \
7878
| 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" \
7979
| while read action entry; do
8080
case "$action" in

0 commit comments

Comments
 (0)