fixup - correctly detect F15 builds
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:
parent
23e048d7de
commit
d61ae8c1e6
@ -78,7 +78,7 @@ arch/x86/kvm
|
||||
%endfor
|
||||
remove /modules/*/{build,source,*.map}
|
||||
|
||||
%if int(product.version) >= 15:
|
||||
%if int(product.version) > 15:
|
||||
## Clean up systemd
|
||||
removefrom ConsoleKit /lib/systemd/*
|
||||
removefrom avahi /lib/systemd/*
|
||||
|
@ -29,7 +29,7 @@ move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-pa
|
||||
move etc/yum.repos.d etc/anaconda.repos.d
|
||||
|
||||
## misc_tree_modifications()
|
||||
%if int(product.version) >= 15:
|
||||
%if int(product.version) > 15:
|
||||
## Configure systemd to start anaconda
|
||||
symlink /sbin/init init
|
||||
remove etc/systemd/system/default.target
|
||||
|
@ -147,7 +147,8 @@ class TreeBuilder(object):
|
||||
# Hush some dracut warnings. TODO: bind-mount proc in place?
|
||||
open(joinpaths(self.vars.inroot,"/proc/modules"),"w")
|
||||
# Add some extra bits to the dracut initramfs
|
||||
dracut += self.anaconda_dracut_hack()
|
||||
if int(self.vars.product.version) <= 15:
|
||||
dracut += self.anaconda_dracut_hack()
|
||||
# XXX FIXME: add anaconda dracut module!
|
||||
for kernel in self.kernels:
|
||||
logger.info("rebuilding %s", kernel.initrd.path)
|
||||
|
Loading…
Reference in New Issue
Block a user