[patch] Handle non-ascii system partitions