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

Fix an error when creating the lib directory

Browse Source
This commit is contained in:
Martin Gracik 2010-02-25 20:43:06 +01:00
parent d13f13e92f
commit 438d73b51a
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/templates/initrd.ltmpl
View File

@ -7,12 +7,10 @@ makedirs "sbin"
symlink "sbin" "bin" symlink "sbin" "bin"
makedirs "dev" makedirs "dev"
makedirs "etc" makedirs "etc"
makedirs "lib"
makedirs "proc" makedirs "proc"
makedirs "selinux" makedirs "selinux"
makedirs "sys" makedirs "sys"
makedirs "tmp" makedirs "tmp"
makedirs "usr"
makedirs "var" makedirs "var"
## copy etc stuff ## copy etc stuff
@ -31,14 +29,13 @@ copy "sbin/umount.*"
copy "sbin/udevd" copy "sbin/udevd"
copy "sbin/udevadm" copy "sbin/udevadm"
symlink "udevadm" "sbin/udevinfo" symlink "udevadm" "sbin/udevinfo"
symlink "udevadm" "sbin/udevsettle"
## copy udev conf and rules ## copy udev conf and rules
copy "etc/udev/udev.conf" copy "etc/udev/udev.conf"
copy "etc/udev/rules.d/*.rules"
copy "lib/udev/*" copy "lib/udev/*"
remove "lib/udev/rules.d/*persistent*" remove "lib/udev/rules.d/*persistent*"
remove "lib/udev/rules.d/*generator*" remove "lib/udev/rules.d/*generator*"
copy "etc/udev/rules.d/*.rules"
## copy bash ## copy bash
copy "bin/bash" copy "bin/bash"
@ -76,11 +73,11 @@ copy "usr/sbin/hald" "sbin"
copy "usr/libexec/hald-runner" copy "usr/libexec/hald-runner"
copy "usr/libexec/hald-generate-fdi-cache" copy "usr/libexec/hald-generate-fdi-cache"
copy "usr/libexec/hal*storage*" copy "usr/libexec/hal*storage*"
makedirs "var/run"
touch "var/run/hald.acl-list"
copy "usr/share/hal/fdi/*" copy "usr/share/hal/fdi/*"
copy "etc/hal/fdi/*" copy "etc/hal/fdi/*"
copy "etc/dbus-1/system.d/hal.conf" copy "etc/dbus-1/system.d/hal.conf"
makedirs "var/run"
touch "var/run/hald.acl-list"
## policykit ## policykit
copy "etc/polkit-1" copy "etc/polkit-1"
@ -102,10 +99,10 @@ copy "usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
## networkmanager ## networkmanager
copy "usr/sbin/NetworkManager" copy "usr/sbin/NetworkManager"
copy "etc/dbus-1/system.d/nm-*.conf"
copy "etc/dbus-1/system.d/NetworkManager.conf"
copy "etc/NetworkManager/nm-system-settings.conf" copy "etc/NetworkManager/nm-system-settings.conf"
copy "usr/${libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so" copy "etc/dbus-1/system.d/NetworkManager.conf"
copy "etc/dbus-1/system.d/nm-*.conf"
copy "usr/${libdir}/NetworkManager/libnm-*"
copy "usr/libexec/nm-*" copy "usr/libexec/nm-*"
copy "usr/share/dbus-1/system-services/org.freedesktop.nm_dispatcher.service" copy "usr/share/dbus-1/system-services/org.freedesktop.nm_dispatcher.service"
@ -128,9 +125,9 @@ copy "usr/share/terminfo/g/gnome"
## misc ## misc
copy "bin/awk" copy "bin/awk"
copy "bin/grep"
copy "bin/egrep" copy "bin/egrep"
copy "bin/fgrep" copy "bin/fgrep"
copy "bin/grep"
copy "bin/kill" copy "bin/kill"
copy "bin/ln" copy "bin/ln"
copy "usr/bin/readlink" "bin" copy "usr/bin/readlink" "bin"

2
src/pylorax/images.py
View File

@ -117,7 +117,7 @@ export PS1 PATH
# create the lib directories # create the lib directories
os.mkdir(os.path.join(self.dsttree, self.conf.libdir)) os.mkdir(os.path.join(self.dsttree, self.conf.libdir))
os.mkdir(os.path.join(self.dsttree, "usr", self.conf.libdir)) os.makedirs(os.path.join(self.dsttree, "usr", self.conf.libdir))
# XXX # XXX
def get_kernel_modules(self, kernel, modset): def get_kernel_modules(self, kernel, modset):