dracut.sh: first install /usr dirs, then toplevel
authorHarald Hoyer <harald@redhat.com>
Thu, 23 Feb 2012 20:10:17 +0000 (21:10 +0100)
committerHarald Hoyer <harald@redhat.com>
Fri, 24 Feb 2012 13:58:21 +0000 (14:58 +0100)
This saves some checks in inst_dir.

dracut.sh

index 38543beb6997538ebe000871d04c63dd7bfee821..e6c36d97d6bf8a3622cb38eb4ac2fc870fffab21 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -642,18 +642,18 @@ if [[ $prefix ]]; then
 fi
 
 if [[ $kernel_only != yes ]]; then
-    for d in bin etc lib "$libdir" sbin tmp usr var var/log usr/bin usr/sbin; do
+    for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log; do
         [[ -e "${initdir}${prefix}/$d" ]] && continue
-        if [ -h "/$d" ]; then
-            inst "/$d" "${prefix}/$d"
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d" "${prefix}/$d"
         else
             mkdir -m 0755 -p "${initdir}${prefix}/$d"
         fi
     done
 
     for d in dev proc sys sysroot root run run/lock run/initramfs; do
-        if [ -h "/$d" ]; then
-            inst "/$d"
+        if [ -L "/$d" ]; then
+            inst_symlink "/$d"
         else
             mkdir -m 0755 -p "$initdir/$d"
         fi