mkinitrd(8): Stop copying regular binaries to the ramdisk

* initrd binaries are specially tailored versions and don't necessarily
  work in the same way as regular ones

* In fact, regular binaries from newer DragonFly systems are expected to
  use dynamic libraries and won't work at all in the fully static environment
  of the ramdisk

diff --git a/etc/defaults/mkinitrd.conf b/etc/defaults/mkinitrd.conf
index 6729369..48fab36 100644 (file)
--- a/etc/defaults/mkinitrd.conf
+++ b/etc/defaults/mkinitrd.conf
@@ -1,10 +1,7 @@
 # Default configuration for mkinitrd(8)
 #
-BIN_TOOLS="mkdir rm sh kill"
 BOOT_DIR="/boot"
 CONTENT_DIRS="/usr/share/initrd"
 INITRD_DIRS="bin boot dev etc mnt proc sbin tmp var new_root"
 INITRD_SIZE="15m"
-SBIN_TOOLS="mount mount_devfs mount_hammer mount_nfs mount_null mount_procfs \
-       mount_tmpfs umount iscontrol cryptsetup lvm sysctl udevd tcplay"
 TMP_DIR="/tmp"

diff --git a/sbin/mkinitrd/mkinitrd.8 b/sbin/mkinitrd/mkinitrd.8
index e606660..c4d3408 100644 (file)
--- a/sbin/mkinitrd/mkinitrd.8
+++ b/sbin/mkinitrd/mkinitrd.8
@@ -79,8 +79,6 @@ following variables (defaults are in
 .Bd -literal -offset indent
 BUILD_DIR
 INITRD_SIZE
-BIN_TOOLS
-SBIN_TOOLS
 INITRD_DIRS
 CONTENT_DIRS
 .Ed

diff --git a/sbin/mkinitrd/mkinitrd.sh b/sbin/mkinitrd/mkinitrd.sh
index b04b2b1..d53440f 100644 (file)
--- a/sbin/mkinitrd/mkinitrd.sh
+++ b/sbin/mkinitrd/mkinitrd.sh
@@ -80,19 +80,6 @@ make_hier()
        echo "Created directory structure"
 }
 
-copy_tools()
-{
-       for tool in ${BIN_TOOLS}; do
-               objcopy -S /bin/${tool} ${BUILD_DIR}/bin/${tool}
-       done
-
-       for tool in ${SBIN_TOOLS}; do
-               objcopy -S /sbin/${tool} ${BUILD_DIR}/sbin/${tool}
-       done
-
-       echo "Copied essential tools"
-}
-
 copy_content()
 {
        for dir in ${CONTENT_DIRS}; do
@@ -132,7 +119,6 @@ BUILD_DIR="${TMP_DIR}/initrd"
 create_vn
 copy_content
 make_hier
-copy_tools
 print_info
 destroy_vn
 mv ${TMP_DIR}/initrd.img ${BOOT_DIR}/kernel/initrd.img