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

prefer "basearch" to "arch.basearch" (also "libdir")

Browse Source
This commit is contained in:
Will Woods 2011-07-25 19:44:14 -04:00
parent f1b5c77e50
commit de49d1fbd9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
share/runtime-postinstall.tmpl
View File

@ -1,22 +1,22 @@
<%page args="root, basearch, libdir, configdir"/> <%page args="root, basearch, libdir, configdir"/>
<% <%
KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % arch.basearch KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % basearch
SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % arch.basearch SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % basearch
PYTHONDIR = glob("usr/"+arch.libdir+"/python?.?")[0] PYTHONDIR = glob("usr/"+libdir+"/python?.?")[0]
stubs = ("list-harddrives", "loadkeys", "raidstart", "raidstop") stubs = ("list-harddrives", "loadkeys", "raidstart", "raidstop")
%> %>
## create_keymaps(arch.basearch) ## create_keymaps()
%if arch.basearch not in ("s390", "s390x"): %if basearch not in ("s390", "s390x"):
%if exists(KEYMAP_OVERRIDE): %if exists(KEYMAP_OVERRIDE):
move ${KEYMAP_OVERRIDE} etc/keymaps.gz move ${KEYMAP_OVERRIDE} etc/keymaps.gz
%else: %else:
runcmd ${root}/usr/libexec/anaconda/getkeymaps ${arch.basearch} ${root}/etc/keymaps.gz ${root} runcmd ${root}/usr/libexec/anaconda/getkeymaps ${basearch} ${root}/etc/keymaps.gz ${root}
%endif %endif
%endif %endif
## create_screenfont() ## create_screenfont()
moveif usr/share/anaconda/screenfont-${arch.basearch}.gz etc/screenfont.gz moveif usr/share/anaconda/screenfont-${basearch}.gz etc/screenfont.gz
## move_stubs() ## move_stubs()
move usr/share/anaconda/restart-anaconda usr/bin move usr/share/anaconda/restart-anaconda usr/bin
@ -90,7 +90,7 @@ append etc/shadow "root::14438:0:99999:7:::"
append etc/shadow "install::14438:0:99999:7:::" append etc/shadow "install::14438:0:99999:7:::"
chmod etc/shadow 400 chmod etc/shadow 400
%if arch.basearch in ("s390", "s390x"): %if basearch in ("s390", "s390x"):
## misc_s390_modifications() ## misc_s390_modifications()
remove sbin/init remove sbin/init
move usr/share/anaconda/linuxrc.s390 sbin/init move usr/share/anaconda/linuxrc.s390 sbin/init