diff --git a/srcpkgs/initramfs-tools/files/conf/initramfs.conf b/srcpkgs/initramfs-tools/files/conf/initramfs.conf index a2bd8db41e1..22406a83162 100644 --- a/srcpkgs/initramfs-tools/files/conf/initramfs.conf +++ b/srcpkgs/initramfs-tools/files/conf/initramfs.conf @@ -19,14 +19,6 @@ MODULES=most -# -# BUSYBOX: [ y | n ] -# -# Use busybox if available. -# - -BUSYBOX=y - # # KEYMAP: [ y | n ] # diff --git a/srcpkgs/initramfs-tools/files/hooks/blkid b/srcpkgs/initramfs-tools/files/hooks/blkid index 3442bd09e1c..be3b62b7141 100755 --- a/srcpkgs/initramfs-tools/files/hooks/blkid +++ b/srcpkgs/initramfs-tools/files/hooks/blkid @@ -18,6 +18,6 @@ esac . /usr/share/initramfs-tools/hook-functions # from libblkid -copy_exec /sbin/blkid.static /sbin/blkid +copy_exec /sbin/blkid /sbin exit 0 diff --git a/srcpkgs/initramfs-tools/files/hooks/busybox b/srcpkgs/initramfs-tools/files/hooks/busybox index 1b1107103e5..5b2a3f58ac2 100755 --- a/srcpkgs/initramfs-tools/files/hooks/busybox +++ b/srcpkgs/initramfs-tools/files/hooks/busybox @@ -1,5 +1,6 @@ #!/bin/sh +BUSYBOXDIR="/usr/lib/busybox-initramfs/bin" PREREQ="" prereqs() @@ -15,21 +16,7 @@ prereqs) ;; esac -# Busybox -. /etc/initramfs-tools/initramfs.conf - -if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then - # those root need busybox - eval "$(mount | awk '/ \/ / {print "r_dev=" $1; exit}')" - if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ]; then - echo "Warning: Busybox is required for successful boot!" - fi -else - . /usr/share/initramfs-tools/hook-functions - rm -f ${DESTDIR}/bin/sh - rm -f ${DESTDIR}/bin/busybox - copy_exec ${BUSYBOXDIR}/busybox /bin/busybox - ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh -fi +. /usr/share/initramfs-tools/hook-functions +copy_exec ${BUSYBOXDIR}/busybox /bin/busybox exit 0 diff --git a/srcpkgs/initramfs-tools/files/initramfs.conf.5 b/srcpkgs/initramfs-tools/files/initramfs.conf.5 index 6f6ee061425..eacb5dded6a 100644 --- a/srcpkgs/initramfs-tools/files/initramfs.conf.5 +++ b/srcpkgs/initramfs-tools/files/initramfs.conf.5 @@ -33,14 +33,6 @@ The default setting is \fImost\fP. \fIlist\fP includes only modules from the additional modules list to load them early. -.TP -\fB BUSYBOX -Include busybox utilities for the boot scripts. -If set to 'n' -.B mkinitramfs -will build an initramfs without busybox. -Beware that many boot scripts need busybox utilities. - .TP \fB KEYMAP If set to 'y', the console keymap will be loaded during the initramfs stage. diff --git a/srcpkgs/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs index 668029c3792..f96e10a0c77 100755 --- a/srcpkgs/initramfs-tools/files/mkinitramfs +++ b/srcpkgs/initramfs-tools/files/mkinitramfs @@ -8,7 +8,6 @@ keep="n" CONFDIR="/etc/initramfs-tools" verbose="n" errors_to="2>/dev/null" -export BUSYBOXDIR="/usr/lib/busybox-initramfs/bin" OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"` diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index a92831a32ce..284625b0ea8 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,6 +1,6 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -version=0.94 +version=0.95 build_style=custom-install short_desc="Tools for generating an initramfs" maintainer="Juan RP "