diff --git a/etc/templates/initrd.ltmpl b/etc/templates/initrd.ltmpl index a8a72f2e..a2483d4a 100644 --- a/etc/templates/initrd.ltmpl +++ b/etc/templates/initrd.ltmpl @@ -62,6 +62,7 @@ copy "bin/hostname" copy "sbin/ethtool" copy "sbin/route" touch "etc/resolv.conf" +makedirs "etc/dhcp" ## hwdata copy "usr/share/hwdata/pci.ids" @@ -100,6 +101,7 @@ copy "usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" ## networkmanager copy "usr/sbin/NetworkManager" +makedirs "etc/NetworkManager/dispatcher.d" copy "etc/NetworkManager/nm-system-settings.conf" copy "etc/dbus-1/system.d/NetworkManager.conf" copy "etc/dbus-1/system.d/nm-*.conf" @@ -193,6 +195,7 @@ makedirs "var/lock" makedirs "var/lock/rpm" makedirs "var/run/NetworkManager" makedirs "var/run/wpa_supplicant" +makedirs "var/run/hald" makedirs "var/lib/dhclient" diff --git a/src/pylorax/images.py b/src/pylorax/images.py index 5ae6ac7b..54dfb7c5 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -308,9 +308,10 @@ export PS1 PATH cmd = "{0.DEPMOD} -a -F {1} -b {2} {3}" cmd = cmd.format(self.cmd, systemmap, - self.srctree, kernel.version) + self.dsttree, kernel.version) err, stdout = commands.getstatusoutput(cmd) + print stdout if err: self.perror(stdout)