[PATCH 05/13] lang-table and lang-names have moved to /usr/share/anaconda.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 language.py          |    4 ++--
 scripts/mk-images    |    2 +-
 scripts/upd-instroot |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/language.py b/language.py
index c0270c2..4de330c 100644
--- a/language.py
+++ b/language.py
@@ -144,7 +144,7 @@ class Language(object):
         self.nativeLangNames = {}
 
         # English name -> native name mapping
-        search = ('lang-names', '/usr/lib/anaconda/lang-names')
+        search = ('lang-names', '/usr/share/anaconda/lang-names')
         for path in search:
             if os.access(path, os.R_OK):
                 f = open(path, 'r')
@@ -158,7 +158,7 @@ class Language(object):
 
         # nick -> (name, short name, font, keyboard, timezone) mapping
         search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table',
-                  '/usr/lib/anaconda/lang-table')
+                  '/usr/share/anaconda/lang-table')
         for path in search:
             if os.access(path, os.R_OK):
                 f = open(path, "r")
diff --git a/scripts/mk-images b/scripts/mk-images
index 6cac85f..50b120a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -171,7 +171,7 @@ MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist
 MODINFO=$TMPDIR/modinfo-$BUILDARCH.$$
 LOADERBINDIR=$IMGPATH/usr/lib/anaconda-runtime/loader
 BOOTDISKDIR=$IMGPATH/usr/lib/anaconda-runtime/boot
-LANGTABLE=$IMGPATH/usr/lib/anaconda/lang-table
+LANGTABLE=$IMGPATH/usr/share/anaconda/lang-table
 PCIIDS=$IMGPATH/usr/share/hwdata/pci.ids
 XDRIVERS=$IMGPATH/usr/share/hwdata/videoaliases
 XDRIVERDESCS=$IMGPATH/usr/share/hwdata/videodrivers
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 7fdd58b..bebee1c 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -940,7 +940,7 @@ chown -R root:root $DEST
 chmod -R a+rX-w $DEST
 
 # Remove locales unused during the install
-cat $DEST/usr/lib/anaconda/lang-table* | awk '
+cat $DEST/usr/share/anaconda/lang-table* | awk '
 { gsub("-", "", $4);
   print $4;
   print gensub(/\..*$/,"","",$4);
-- 
1.6.5.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list