summaryrefslogtreecommitdiffstats
path: root/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-09-15 05:06:04 (GMT)
committerCecil <knoppmyth@gmail.com>2011-09-15 05:06:04 (GMT)
commit593c87be9886a63b94133621f46484be7c0f8884 (patch)
tree306abf2ed106b326e3c8dd44f62392ff2474b0a0 /build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686
parent4786470aa579f9d7b7ce3fde655e5673e690f112 (diff)
parent3b5fc3346d55c199899ed4eea984ca2783631cfe (diff)
downloadlinhes_dev-593c87be9886a63b94133621f46484be7c0f8884.zip
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_dev into testing
Diffstat (limited to 'build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686')
-rwxr-xr-xbuild_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh5
-rwxr-xr-xbuild_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf2
-rw-r--r--build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen6
3 files changed, 6 insertions, 7 deletions
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/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
index 391c913..1d2bb7f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
@@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname`
#The following is only used on the install. After the first boot everything is set from /etc/net.
#DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld !dbus !avahi-daemon)
+DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld dbus avahi-daemon)
# End of file
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
-