[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[LORAX-f17-branch 4/4] remove anaconda-copy-ks.sh



From: Will Woods <wwoods redhat com>

anaconda-copy-ks.sh is included in the 'anaconda' dracut module, so we
don't need to install it here anymore.
---
 share/dracut_hooks/99anaconda-copy-ks.sh |    4 ----
 src/pylorax/treebuilder.py               |    4 +---
 2 files changed, 1 insertions(+), 7 deletions(-)
 delete mode 100644 share/dracut_hooks/99anaconda-copy-ks.sh

diff --git a/share/dracut_hooks/99anaconda-copy-ks.sh b/share/dracut_hooks/99anaconda-copy-ks.sh
deleted file mode 100644
index ed52088..0000000
--- a/share/dracut_hooks/99anaconda-copy-ks.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Copy over kickstart files from the initrd to the sysroot before pivot
-cp /*cfg /*ks /sysroot/ 2> /dev/null
-
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 2e3c47f..87e81b3 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -175,8 +175,6 @@ class TreeBuilder(object):
                   "--nomdadmconf", "--nolvmconf"] + add_args
         if not backup:
             dracut.append("--force")
-        hooks = [("99anaconda-copy-ks.sh", "/lib/dracut/hooks/pre-pivot")]
-        hook_commands = self.copy_dracut_hooks(hooks)
 
         # Hush some dracut warnings. TODO: bind-mount proc in place?
         open(joinpaths(self.vars.inroot,"/proc/modules"),"w")
@@ -186,7 +184,7 @@ class TreeBuilder(object):
                 initrd = joinpaths(self.vars.inroot, kernel.initrd.path)
                 os.rename(initrd, initrd + backup)
             check_call(["chroot", self.vars.inroot] + \
-                       dracut + hook_commands + [kernel.initrd.path, kernel.version])
+                       dracut + [kernel.initrd.path, kernel.version])
         os.unlink(joinpaths(self.vars.inroot,"/proc/modules"))
 
     def build(self):
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]