Merge branch 'mkinit-install'

1 files changed, 9 insertions, 35 deletions

diff --git a/mkinitramfs b/mkinitramfs
index 4c738bb..d7d3d61 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -126,27 +126,7 @@ function cache_dir_setup {
   # Clean the cache so we start fresh
   rm -rf ${cache} && mkdir ${cache}
 
-  local dirs=(
-    bin
-    dev
-    dev/disk
-    dev/disk/by-uuid
-    etc
-    lib
-    lib32
-    lib64
-    mnt/root
-    proc
-    root
-    run
-    sbin
-    sys
-    usr/lib
-    usr/lib64
-    usr/lib32
-    usr/bin
-    usr/sbin
-  )
+  local dirs=(bin dev etc lib lib32 lib64 mnt/root proc root run sbin sys usr)
 
   # Create the temporary directory structure
   for i in ${dirs[*]}; do
@@ -209,7 +189,7 @@ function main {
   # List of binaries to exist in the new initramfs
   resolve_bins \
     bash cat echo ls cryptsetup chmod chown mount sleep umount clear cut \
-    grep less tr which blkid shutdown switch_root
+    grep less tr which blkid reboot shutdown switch_root
 
 
   # Set up the archive source dir.
@@ -220,28 +200,22 @@ function main {
 
   # Copy binary and dependencies to cache dir
   for bin in ${fqbins[@]}; do
-    bindirname=$(dirname ${bin})
     # Copy the binary of interest
-    cp -u ${bin} "${cache}/${bindirname}/"
+    install -D "${bin}" "${cache}/${bin}"
 
-    deps=$(get_deps ${bin})
+    local deps=$(get_deps ${bin})
     # Copy each of the binary's deps
     for dep in ${deps[@]}; do
-      local depdirname=$(dirname ${dep})
-      cp -u ${dep} "${cache}/${depdirname}/"
-      if [[ $? -gt 0 ]]; then
-        echo "Error: Problem copying ${dep} into ${cache}."
-	      exit 1
-      fi
+      install -D ${dep} "${cache}/${dep}"
     done
   done
 
-  # Copy in init script and add execute
-  cp ${res_path}/init ${cache}/init && chmod +x ${cache}/init
   # Copy in message file
-  cp ${res_path}/msg ${cache}/etc/msg
+  [[ -f ${res_path}/msg ]] && install -D ${res_path}/msg ${cache}/etc/msg
+  # Copy in init script and add execute
+  install -D -m 755 ${res_path}/init ${cache}/init
   # Copy in the system shell profile
-  cp /etc/profile ${cache}/etc/profile
+  install -D /etc/profile ${cache}/etc/profile
 
   # Create archive image
   mkcpio ${cache} ${version}