From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Wed, 18 Aug 2010 18:06:44 +0000 (+0200)
Subject: dracut: lib and usr/lib dirs detection
X-Git-Tag: 008~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa5cd2bf50d86885de9ae3ce18d1c36c62b0d9ed;p=thirdparty%2Fdracut.git

dracut: lib and usr/lib dirs detection

First we check if $libdir and $usrlibdir vars are already set in config
file. If not we perform simple detect. Vars are exported - to be useful
in module/check scripts.
---

diff --git a/dracut b/dracut
index 4cf2ca3d2..3b0848ff1 100755
--- a/dracut
+++ b/dracut
@@ -223,6 +223,17 @@ fi
 dracutfunctions=$dracutbasedir/dracut-functions
 export dracutfunctions
 
+# Detect lib paths
+[[ $libdir ]] || for libdir in /lib64 /lib; do
+    [[ -d $libdir ]] && break
+done || {
+    derror 'No lib directory?!!!'
+    exit 1
+}
+[[ $usrlibdir ]] || for usrlibdir in /usr/lib64 /usr/lib; do
+    [[ -d $usrlibdir ]] && break
+done || dwarning 'No usr/lib directory!'
+
 # This is kinda legacy -- eventually it should go away.
 case $dracutmodules in
     ""|auto) dracutmodules="all" ;;
@@ -273,7 +284,7 @@ chmod 755 "$initdir"
 export initdir hookdirs dracutbasedir dracutmodules drivers \
     fw_dir drivers_dir debug beverbose no_kernel kernel_only \
     add_drivers mdadmconf lvmconf filesystems ignore_kmodules \
-    use_fstab
+    use_fstab libdir usrlibdir
 
 if [[ $kernel_only != yes ]]; then
     # Create some directory structure first