[lorax 2/3] Changed some pathes to work with new anaconda

[Martin Gracik <mgracik@xxxxxxxxxx>]

In recent anaconda version, some paths were changed
from usr/lib/anaconda-runtime to usr/share/anaconda
so we had to change this paths also in lorax
---
 etc/templates/initrd.ltmpl |   18 +++++++++---------
 src/pylorax/constants.py   |   10 ++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/etc/templates/initrd.ltmpl b/etc/templates/initrd.ltmpl
index 97d5146..6d6d4f5 100644
--- a/etc/templates/initrd.ltmpl
+++ b/etc/templates/initrd.ltmpl
@@ -151,8 +151,8 @@ makedirs "var/lib"
 symlink "../../tmp" "var/lib/xkb"
 
 ## loader
-copy "usr/lib/anaconda-runtime/loader/loader" "sbin"
-copy "usr/lib/anaconda-runtime/loader/loader.tr" "etc"
+copy "usr/lib/anaconda/loader" "sbin"
+copy "usr/share/anaconda/loader.tr" "etc"
 
 ## ld-linux
 % if basearch in ("i386",):
@@ -169,7 +169,7 @@ copy "${libdir}/libnss_files.so.2"
 copy "usr/${libdir}/libsqlite3.so.0"
 
 ## langtable
-copy "usr/lib/anaconda/lang-table" "etc"
+copy "usr/share/anaconda/lang-table" "etc"
 
 ## arch bits
 edit "etc/arch" "${buildarch}"
@@ -202,13 +202,13 @@ copy "${libdir}/security/*"
 
 ## architecture specific code
 % if basearch in ("i386", "x86_64"):
-    copy "usr/lib/anaconda-runtime/loader/init" "sbin"
+    copy "usr/lib/anaconda/init" "sbin"
     symlink "init" "sbin/reboot"
     symlink "init" "sbin/halt"
     symlink "init" "sbin/poweroff"
 
     ## screenfont
-    copy "usr/lib/anaconda-runtime/screenfont-${basearch}.gz" "etc"
+    copy "usr/share/anaconda/screenfont-${basearch}.gz" "etc"
     rename "etc/screenfont-${basearch}.gz" "etc/screenfont.gz"
 % endif
 
@@ -222,12 +222,12 @@ copy "${libdir}/security/*"
     copy "${libdir}/libpam_misc.so*"
     copy "${libdir}/libwrap*.so*"
 
-    copy "usr/lib/anaconda-runtime/loader/shutdown" "sbin"
-    copy "usr/lib/anaconda-runtime/loader/linuxrc.s390" "sbin"
+    copy "usr/lib/anaconda/shutdown" "sbin"
+    copy "usr/lib/anaconda/linuxrc.s390" "sbin"
     rename "sbin/linuxrc.s390" "sbin/init"
-    copy "usr/lib/anaconda-runtime/loader/lsznet.raw" "sbin"
+    copy "usr/lib/anaconda/lsznet.raw" "sbin"
     rename "sbin/lsznet.raw" "sbin/lsznet"
-    copy "usr/lib/anaconda-runtime/loader/controlunits.sh" "sbin"
+    copy "usr/lib/anaconda/controlunits.sh" "sbin"
     rename "sbin/controlunits.sh" "sbin/controlunits"
 
     copy "${libdir}/security/pam*.so"
diff --git a/src/pylorax/constants.py b/src/pylorax/constants.py
index e17de83..43a0845 100644
--- a/src/pylorax/constants.py
+++ b/src/pylorax/constants.py
@@ -27,9 +27,8 @@ class LoraxConstants(object):
     ROOT_UID = 0
 
     ANACONDA_PACKAGE = "anaconda"
-    ANACONDA_RUNTIME = "usr/lib/anaconda-runtime"
-    ANACONDA_BOOTDIR = "usr/lib/anaconda-runtime/boot"
-    ANACONDA_LOADERDIR = "usr/lib/anaconda-runtime/loader"
+    ANACONDA_RUNTIME = "usr/share/anaconda"
+    ANACONDA_BOOTDIR = "usr/share/anaconda/boot"
 
     BOOTDIR = "boot"
     BOOTDIR_IA64 = "boot/efi/EFI/redhat"
@@ -48,14 +47,13 @@ class LoraxConstants(object):
 
     MODDEPFILE = "modules.dep"
     MODULEINFO = "module-info"
-    MODLIST = "usr/lib/anaconda-runtime/modlist"
 
     LOCALEDIR = "usr/lib/locale"
     LOCALES = "usr/share/locale"
-    LANGTABLE = "usr/lib/anaconda/lang-table"
+    LANGTABLE = "usr/share/anaconda/lang-table"
 
     ISOLINUXBIN = "usr/share/syslinux/isolinux.bin"
-    SYSLINUXCFG = "usr/lib/anaconda-runtime/boot/syslinux.cfg"
+    SYSLINUXCFG = "usr/share/anaconda/boot/syslinux.cfg"
 
     LDSOCONF = "etc/ld.so.conf"
     MANCONF = "etc/man.config"
-- 
1.6.6

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