From 3b5fc3346d55c199899ed4eea984ca2783631cfe Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 2 Sep 2011 14:08:00 -0500 Subject: profiles: Generate locales as part of the post-process. Remove the locale.gen overlay --- .../linhes-local-disk-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen | 6 ------ .../linhes-local-mirror-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen | 6 ------ .../linhes-remote-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen | 6 ------ 6 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen delete mode 100644 build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen delete mode 100644 build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - -- cgit v0.12