diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 99922cf9..97dd38fc 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -1,18 +1,8 @@ ## lorax template file: cleanup for the ramdisk (runtime image) -<%page args="removelocales, libdir, product, root"/> +<%page args="libdir, product, root"/> -## strip unused languages out of the locale-archive -runcmd localedef --prefix ${root} \ - --delete-from-archive ${" ".join(removelocales)} -move usr/lib/locale/locale-archive usr/lib/locale/locale-archive.tmpl -runcmd chroot ${root} build-locale-archive ## remove the sources remove usr/share/i18n -## remove unused locales -%for locale in removelocales: - remove usr/share/locale/${locale} -%endfor -remove usr/share/anaconda/lang-table ## not required packages installed as dependencies ## no perl (it gets pulled in on ppc) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 114e00b2..41df26d9 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -38,7 +38,6 @@ systemctl mask fedora-configure.service fedora-loadmodules.service \ ## install some basic configuration files append etc/resolv.conf "" append etc/fstab "" -copy usr/share/anaconda/lang-table etc install ${configdir}/i18n etc/sysconfig install ${configdir}/rsyslog.conf etc install ${configdir}/bash_history root/.bash_history diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 95f4a051..b6e5527d 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -127,13 +127,7 @@ class RuntimeBuilder(object): def cleanup(self): '''Remove unneeded packages and files with runtime-cleanup.tmpl''' - # get removelocales list first - localedir = joinpaths(self.vars.root, "usr/share/locale") - langtable = joinpaths(self.vars.root, "usr/share/anaconda/lang-table") - locales = set([d for d in os.listdir(localedir) if isdir(joinpaths(localedir,d))]) - keeplocales = [line.split()[1] for line in open(langtable)] - removelocales = locales.difference(keeplocales) - self._runner.run("runtime-cleanup.tmpl", removelocales=removelocales) + self._runner.run("runtime-cleanup.tmpl") def writepkgsizes(self, pkgsizefile): '''debugging data: write a big list of pkg sizes'''