From 438d73b51a476ebb74e360c57cca45defd93d9c5 Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Thu, 25 Feb 2010 20:43:06 +0100
Subject: [PATCH] Fix an error when creating the lib directory

---
 etc/templates/initrd.ltmpl | 17 +++++++----------
 src/pylorax/images.py      |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/etc/templates/initrd.ltmpl b/etc/templates/initrd.ltmpl
index b4e11a8d..be9ceaa6 100644
--- a/etc/templates/initrd.ltmpl
+++ b/etc/templates/initrd.ltmpl
@@ -7,12 +7,10 @@ makedirs "sbin"
 symlink "sbin" "bin"
 makedirs "dev"
 makedirs "etc"
-makedirs "lib"
 makedirs "proc"
 makedirs "selinux"
 makedirs "sys"
 makedirs "tmp"
-makedirs "usr"
 makedirs "var"
 
 ## copy etc stuff
@@ -31,14 +29,13 @@ copy "sbin/umount.*"
 copy "sbin/udevd"
 copy "sbin/udevadm"
 symlink "udevadm" "sbin/udevinfo"
-symlink "udevadm" "sbin/udevsettle"
 
 ## copy udev conf and rules
 copy "etc/udev/udev.conf"
+copy "etc/udev/rules.d/*.rules"
 copy "lib/udev/*"
 remove "lib/udev/rules.d/*persistent*"
 remove "lib/udev/rules.d/*generator*"
-copy "etc/udev/rules.d/*.rules"
 
 ## copy bash
 copy "bin/bash"
@@ -76,11 +73,11 @@ copy "usr/sbin/hald" "sbin"
 copy "usr/libexec/hald-runner"
 copy "usr/libexec/hald-generate-fdi-cache"
 copy "usr/libexec/hal*storage*"
-makedirs "var/run"
-touch "var/run/hald.acl-list"
 copy "usr/share/hal/fdi/*"
 copy "etc/hal/fdi/*"
 copy "etc/dbus-1/system.d/hal.conf"
+makedirs "var/run"
+touch "var/run/hald.acl-list"
 
 ## policykit
 copy "etc/polkit-1"
@@ -102,10 +99,10 @@ copy "usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
 
 ## 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 "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/share/dbus-1/system-services/org.freedesktop.nm_dispatcher.service"
 
@@ -128,9 +125,9 @@ copy "usr/share/terminfo/g/gnome"
 
 ## misc
 copy "bin/awk"
+copy "bin/grep"
 copy "bin/egrep"
 copy "bin/fgrep"
-copy "bin/grep"
 copy "bin/kill"
 copy "bin/ln"
 copy "usr/bin/readlink" "bin"
diff --git a/src/pylorax/images.py b/src/pylorax/images.py
index 0764432f..fdb17ff3 100644
--- a/src/pylorax/images.py
+++ b/src/pylorax/images.py
@@ -117,7 +117,7 @@ export PS1 PATH
 
         # create the lib directories
         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
     def get_kernel_modules(self, kernel, modset):