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

fixup - correctly detect F15 builds

Browse Source 
Yeah, for F16 you need to do "version > 15", not ">= 15". Oops.
Also, check product.version before using anaconda_dracut_hack().
This commit is contained in:
Will Woods 2011-07-06 17:12:42 -04:00
parent 23e048d7de
commit d61ae8c1e6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/runtime-cleanup.tmpl
View File

@ -78,7 +78,7 @@ arch/x86/kvm
%endfor %endfor
remove /modules/*/{build,source,*.map} remove /modules/*/{build,source,*.map}
%if int(product.version) >= 15: %if int(product.version) > 15:
## Clean up systemd ## Clean up systemd
removefrom ConsoleKit /lib/systemd/* removefrom ConsoleKit /lib/systemd/*
removefrom avahi /lib/systemd/* removefrom avahi /lib/systemd/*

2
share/runtime-postinstall.tmpl
View File

@ -29,7 +29,7 @@ move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-pa
move etc/yum.repos.d etc/anaconda.repos.d move etc/yum.repos.d etc/anaconda.repos.d
## misc_tree_modifications() ## misc_tree_modifications()
%if int(product.version) >= 15: %if int(product.version) > 15:
## Configure systemd to start anaconda ## Configure systemd to start anaconda
symlink /sbin/init init symlink /sbin/init init
remove etc/systemd/system/default.target remove etc/systemd/system/default.target

1
src/pylorax/treebuilder.py
View File

@ -147,6 +147,7 @@ class TreeBuilder(object):
# Hush some dracut warnings. TODO: bind-mount proc in place? # Hush some dracut warnings. TODO: bind-mount proc in place?
open(joinpaths(self.vars.inroot,"/proc/modules"),"w") open(joinpaths(self.vars.inroot,"/proc/modules"),"w")
# Add some extra bits to the dracut initramfs # Add some extra bits to the dracut initramfs
if int(self.vars.product.version) <= 15:
dracut += self.anaconda_dracut_hack() dracut += self.anaconda_dracut_hack()
# XXX FIXME: add anaconda dracut module! # XXX FIXME: add anaconda dracut module!
for kernel in self.kernels: for kernel in self.kernels: