almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed some pathes to work with new anaconda

Browse Source 
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
This commit is contained in:
Martin Gracik 2010-04-09 13:54:02 +02:00
parent 3419be1223
commit 20b1ddd4b2
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/templates/initrd.ltmpl
View File

@ -151,8 +151,8 @@ makedirs "var/lib"
symlink "../../tmp" "var/lib/xkb" symlink "../../tmp" "var/lib/xkb"
## loader ## loader
copy "usr/lib/anaconda-runtime/loader/loader" "sbin" copy "usr/lib/anaconda/loader" "sbin"
copy "usr/lib/anaconda-runtime/loader/loader.tr" "etc" copy "usr/share/anaconda/loader.tr" "etc"
## ld-linux ## ld-linux
% if basearch in ("i386",): % if basearch in ("i386",):
@ -169,7 +169,7 @@ copy "${libdir}/libnss_files.so.2"
copy "usr/${libdir}/libsqlite3.so.0" copy "usr/${libdir}/libsqlite3.so.0"
## langtable ## langtable
copy "usr/lib/anaconda/lang-table" "etc" copy "usr/share/anaconda/lang-table" "etc"
## arch bits ## arch bits
edit "etc/arch" "${buildarch}" edit "etc/arch" "${buildarch}"
@ -202,13 +202,13 @@ copy "${libdir}/security/*"
## architecture specific code ## architecture specific code
% if basearch in ("i386", "x86_64"): % 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/reboot"
symlink "init" "sbin/halt" symlink "init" "sbin/halt"
symlink "init" "sbin/poweroff" symlink "init" "sbin/poweroff"
## screenfont ## 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" rename "etc/screenfont-${basearch}.gz" "etc/screenfont.gz"
% endif % endif
@ -222,12 +222,12 @@ copy "${libdir}/security/*"
copy "${libdir}/libpam_misc.so*" copy "${libdir}/libpam_misc.so*"
copy "${libdir}/libwrap*.so*" copy "${libdir}/libwrap*.so*"
copy "usr/lib/anaconda-runtime/loader/shutdown" "sbin" copy "usr/lib/anaconda/shutdown" "sbin"
copy "usr/lib/anaconda-runtime/loader/linuxrc.s390" "sbin" copy "usr/lib/anaconda/linuxrc.s390" "sbin"
rename "sbin/linuxrc.s390" "sbin/init" 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" 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" rename "sbin/controlunits.sh" "sbin/controlunits"
copy "${libdir}/security/pam*.so" copy "${libdir}/security/pam*.so"

10
src/pylorax/constants.py
View File

@ -27,9 +27,8 @@ class LoraxConstants(object):
ROOT_UID = 0 ROOT_UID = 0
ANACONDA_PACKAGE = "anaconda" ANACONDA_PACKAGE = "anaconda"
ANACONDA_RUNTIME = "usr/lib/anaconda-runtime" ANACONDA_RUNTIME = "usr/share/anaconda"
ANACONDA_BOOTDIR = "usr/lib/anaconda-runtime/boot" ANACONDA_BOOTDIR = "usr/share/anaconda/boot"
ANACONDA_LOADERDIR = "usr/lib/anaconda-runtime/loader"
BOOTDIR = "boot" BOOTDIR = "boot"
BOOTDIR_IA64 = "boot/efi/EFI/redhat" BOOTDIR_IA64 = "boot/efi/EFI/redhat"
@ -48,14 +47,13 @@ class LoraxConstants(object):
MODDEPFILE = "modules.dep" MODDEPFILE = "modules.dep"
MODULEINFO = "module-info" MODULEINFO = "module-info"
MODLIST = "usr/lib/anaconda-runtime/modlist"
LOCALEDIR = "usr/lib/locale" LOCALEDIR = "usr/lib/locale"
LOCALES = "usr/share/locale" LOCALES = "usr/share/locale"
LANGTABLE = "usr/lib/anaconda/lang-table" LANGTABLE = "usr/share/anaconda/lang-table"
ISOLINUXBIN = "usr/share/syslinux/isolinux.bin" 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" LDSOCONF = "etc/ld.so.conf"
MANCONF = "etc/man.config" MANCONF = "etc/man.config"