From 32eb4874c4b3d868dab27f1fb4e4cb3691c16532 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 5 Apr 2016 15:37:01 -0400 Subject: [PATCH] Drop space-saving hacks We don't need to strip out languages for the workstation image. --- fedora-atomic-workstation-default.json | 4 ---- treecompose-post.sh | 10 ---------- 2 files changed, 14 deletions(-) delete mode 100755 treecompose-post.sh diff --git a/fedora-atomic-workstation-default.json b/fedora-atomic-workstation-default.json index d031f81..48ff71c 100644 --- a/fedora-atomic-workstation-default.json +++ b/fedora-atomic-workstation-default.json @@ -11,10 +11,6 @@ "initramfs-args": ["--no-hostonly"], - "install-langs": ["en_US"], - - "postprocess-script": "treecompose-post.sh", - "etc-group-members": ["wheel"], "ignore-removed-users": ["root"], diff --git a/treecompose-post.sh b/treecompose-post.sh deleted file mode 100755 index 73b6573..0000000 --- a/treecompose-post.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816 -KEEPLANG=en_US -find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name "${KEEPLANG}" -exec rm -rf {} + -localedef --list-archive | grep -a -v ^"${KEEPLANG}" | xargs localedef --delete-from-archive -mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl -build-locale-archive