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

treebuilder cleanup: remove hack for Fedora <= 15

Browse Source
This commit is contained in:
Will Woods 2011-10-12 20:16:05 -04:00
parent f640a2faab
commit 55b4b06268
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pylorax/treebuilder.py
View File

@ -167,9 +167,6 @@ class TreeBuilder(object):
dracut.append("--force") dracut.append("--force")
# 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
if int(self.vars.product.version) <= 15:
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:
logger.info("rebuilding %s", kernel.initrd.path) logger.info("rebuilding %s", kernel.initrd.path)
@ -180,19 +177,6 @@ class TreeBuilder(object):
dracut + [kernel.initrd.path, kernel.version]) dracut + [kernel.initrd.path, kernel.version])
os.unlink(joinpaths(self.vars.inroot,"/proc/modules")) os.unlink(joinpaths(self.vars.inroot,"/proc/modules"))
def anaconda_dracut_hack(self):
'''Hack to make F15 dracut able to boot F15 anaconda properly'''
hookfile = "/tmp/99anaconda-umount.sh" # path relative to inroot
with open(joinpaths(self.vars.inroot,hookfile), "w") as f:
s = ['#!/bin/sh',
'udevadm control --stop-exec-queue',
'udevd=$(pidof udevd) && kill $udevd',
'umount -l /proc /sys /dev/pts /dev',
'echo "mustard=progress" > /proc/cmdline',
'[ "$udevd" ] && kill -9 $udevd']
f.writelines(line+"\n" for line in s)
return ['--include', hookfile, "/lib/dracut/hooks/pre-pivot"]
def build(self): def build(self):
templatefile = templatemap[self.vars.arch.basearch] templatefile = templatemap[self.vars.arch.basearch]
self._runner.run(templatefile, kernels=self.kernels) self._runner.run(templatefile, kernels=self.kernels)