diff options
| -rwxr-xr-x | mbuto | 41 |
1 files changed, 5 insertions, 36 deletions
@@ -368,7 +368,6 @@ cmd_check() { # cleanup() - Remove left-overs on exit, used from trap cleanup() { - [ -n "${ARCHIVEMOUNT}" ] && "${UMOUNT}" "${wd}" 2>/dev/null "${RM}" -rf "${wd}" [ -n "${pkg_tmp}" ] && "${RM}" -f "${pkg_tmp}" [ -n "${compress_test1}" ] && "${RM}" -f "${compress_test1}" @@ -564,16 +563,6 @@ cpio_init() { else OUT="$("${REALPATH}" "${OUT}")" fi - - if [ -n "${ARCHIVEMOUNT}" ]; then - : | "${CPIO}" --create -H newc --quiet | \ - "${GZIP}" > "${OUT}" - fi - fi - - if [ -n "${ARCHIVEMOUNT}" ]; then - "${ARCHIVEMOUNT}" "${OUT}" "${wd}" - info "Mounted CPIO archive ${OUT} at ${wd}" fi } @@ -1099,26 +1088,17 @@ cmds() { [ "${NOSTRIP}" != "y" ] && strip_all - if [ -z "${ARCHIVEMOUNT}" ]; then - ( __out="$("${REALPATH}" "${OUT}")" - "${CD}" "${wd}" - "${FIND}" . | "${CPIO}" --create -H newc --quiet > "${OUT}" - cpio_compress "${__out}" - ) - else - "${SYNC}" - fi + ( __out="$("${REALPATH}" "${OUT}")" + "${CD}" "${wd}" + "${FIND}" . | "${CPIO}" --create -H newc --quiet > "${OUT}" + cpio_compress "${__out}" + ) stats printf "%s" "${OUTPUT}" | \ sed 's,__INITRD__,'"$("${REALPATH}" "${OUT}")"',g' | \ sed 's,__KERNEL__,/boot/vmlinuz-'"${KERNEL}"',g' - - if [ -n "${ARCHIVEMOUNT}" ]; then - trap - EXIT - notice "initramfs mounted at: ${wd}" - fi } # usage() - Print usage and exit @@ -1271,17 +1251,6 @@ else eval "profile_${PROFILE}" || err "profile ${PROFILE} not found" fi -# Check if we can keep the CPIO mounted for convenience as we exit. This isn't -# safe with fakeroot, as contents can't be touched before the environment -# save-file is loaded again, so it needs root (and archivemount). -if [ "${LD_PRELOAD}" = "libfakeroot-sysv.so" ]; then - if command -v archivemount >/dev/null 2>&1; then - notice "Not running as root, won't keep cpio mounted" - fi -elif ! ARCHIVEMOUNT="$(command -v archivemount)"; then - warn "archivemount not available, won't keep cpio mounted" -fi - trap cleanup EXIT cmds "$@" |