almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fixed the generating of modules.dep

Browse Source 
Also added some missing directories to initrd image
This commit is contained in:
Martin Gracik 2010-03-30 13:08:32 +02:00
parent bcea8cdcdd
commit 0645d2ade3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/templates/initrd.ltmpl
View File

@ -62,6 +62,7 @@ copy "bin/hostname"
copy "sbin/ethtool" copy "sbin/ethtool"
copy "sbin/route" copy "sbin/route"
touch "etc/resolv.conf" touch "etc/resolv.conf"
makedirs "etc/dhcp"
## hwdata ## hwdata
copy "usr/share/hwdata/pci.ids" copy "usr/share/hwdata/pci.ids"
@ -100,6 +101,7 @@ copy "usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
## networkmanager ## networkmanager
copy "usr/sbin/NetworkManager" copy "usr/sbin/NetworkManager"
makedirs "etc/NetworkManager/dispatcher.d"
copy "etc/NetworkManager/nm-system-settings.conf" copy "etc/NetworkManager/nm-system-settings.conf"
copy "etc/dbus-1/system.d/NetworkManager.conf" copy "etc/dbus-1/system.d/NetworkManager.conf"
copy "etc/dbus-1/system.d/nm-*.conf" copy "etc/dbus-1/system.d/nm-*.conf"
@ -193,6 +195,7 @@ makedirs "var/lock"
makedirs "var/lock/rpm" makedirs "var/lock/rpm"
makedirs "var/run/NetworkManager" makedirs "var/run/NetworkManager"
makedirs "var/run/wpa_supplicant" makedirs "var/run/wpa_supplicant"
makedirs "var/run/hald"
makedirs "var/lib/dhclient" makedirs "var/lib/dhclient"

3
src/pylorax/images.py
View File

@ -308,9 +308,10 @@ export PS1 PATH
cmd = "{0.DEPMOD} -a -F {1} -b {2} {3}" cmd = "{0.DEPMOD} -a -F {1} -b {2} {3}"
cmd = cmd.format(self.cmd, systemmap, cmd = cmd.format(self.cmd, systemmap,
self.srctree, kernel.version) self.dsttree, kernel.version)
err, stdout = commands.getstatusoutput(cmd) err, stdout = commands.getstatusoutput(cmd)
print stdout
if err: if err:
self.perror(stdout) self.perror(stdout)