From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SV4pP-0003qX-AR for garchives@archives.gentoo.org; Thu, 17 May 2012 17:49:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074F6E0B94; Thu, 17 May 2012 17:49:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B6138E0B94 for ; Thu, 17 May 2012 17:49:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAC9E1B4060 for ; Thu, 17 May 2012 17:49:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B2FB6E5429 for ; Thu, 17 May 2012 17:49:01 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1337275509.419f1cee8b54c7ff69a670af467a5f4139672528.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 419f1cee8b54c7ff69a670af467a5f4139672528 X-VCS-Branch: master Date: Thu, 17 May 2012 17:49:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b3b82889-29ff-4169-b47f-98b2400c3d4d X-Archives-Hash: d858fd4156df0d45321b51c342d381ac commit: 419f1cee8b54c7ff69a670af467a5f4139672528 Author: Sebastian Pipping pipping org> AuthorDate: Thu May 17 16:04:48 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu May 17 17:25:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D419f1cee Be verbose bout files being added to initramfs for --loglevel=3D2 and abo= ve --- gen_initramfs.sh | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index a0a9df2..6c9c88a 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -42,6 +42,15 @@ copy_binaries() { || gen_die "Binary ${f} or some of its library dependencies could not= be copied" } =20 +log_future_cpio_content() { + if [[ "${LOGLEVEL}" -gt 1 ]]; then + echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + echo "About to add these files from '${PWD}' to cpio archive:" + find . | xargs ls -ald + echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + fi +} + append_base_layout() { if [ -d "${TEMP}/initramfs-base-temp" ] then @@ -81,6 +90,7 @@ append_base_layout() { date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date =20 cd "${TEMP}/initramfs-base-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing baselayout cpio" cd "${TEMP}" @@ -110,6 +120,7 @@ append_busybox() { done =20 cd "${TEMP}/initramfs-busybox-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing busybox cpio" cd "${TEMP}" @@ -127,6 +138,7 @@ append_blkid(){ gen_die "Could not extract blkid binary cache!"; } chmod a+x "${TEMP}/initramfs-blkid-temp/sbin/blkid" cd "${TEMP}/initramfs-blkid-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing blkid cpio" cd "${TEMP}" @@ -158,6 +170,7 @@ append_unionfs_fuse() { gen_die 'Could not extract unionfs-fuse binary cache!' chmod a+x "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs" cd "${TEMP}/initramfs-unionfs-fuse-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing unionfs fuse cpio" cd "${TEMP}" @@ -178,6 +191,7 @@ append_unionfs_fuse() { # cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || # gen_die 'Could not copy /etc/suspend.conf' # cd "${TEMP}/initramfs-suspend-temp/" +# log_future_cpio_content # find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ # || gen_die "compressing suspend cpio" # rm -r "${TEMP}/initramfs-suspend-temp/" @@ -205,6 +219,7 @@ append_multipath(){ cp /etc/scsi_id.config "${TEMP}/initramfs-multipath-temp/etc/" || gen_= die 'could not copy scsi_id.config' fi cd "${TEMP}/initramfs-multipath-temp" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing multipath cpio" cd "${TEMP}" @@ -229,6 +244,7 @@ append_dmraid(){ ln -sf raid456.kp raid45.ko cd "${TEMP}/initramfs-dmraid-temp/" fi + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing dmraid cpio" cd "${TEMP}" @@ -248,6 +264,7 @@ append_iscsi(){ gen_die "Could not extract iscsi binary cache!" chmod a+x "${TEMP}/initramfs-iscsi-temp/bin/iscsistart" cd "${TEMP}/initramfs-iscsi-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing iscsi cpio" cd "${TEMP}" @@ -307,6 +324,7 @@ append_lvm(){ # fi fi cd "${TEMP}/initramfs-lvm-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing lvm cpio" cd "${TEMP}" @@ -350,6 +368,7 @@ append_mdadm(){ fi fi cd "${TEMP}/initramfs-mdadm-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing mdadm cpio" cd "${TEMP}" @@ -375,6 +394,7 @@ append_zfs(){ copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zfs,zpool} =20 cd "${TEMP}/initramfs-zfs-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing zfs cpio" cd "${TEMP}" @@ -402,6 +422,7 @@ append_splash(){ cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-splas= h-temp/etc" fi cd "${TEMP}/initramfs-splash-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing splash cpio" cd "${TEMP}" @@ -413,6 +434,7 @@ append_splash(){ =20 append_overlay(){ cd ${INITRAMFS_OVERLAY} + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing overlay cpio" } @@ -440,6 +462,7 @@ append_luks() { copy_binaries "${TEMP}/initramfs-luks-temp/" /sbin/cryptsetup fi =20 + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "appending cryptsetup to cpio" =20 @@ -470,6 +493,7 @@ append_firmware() { else cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware= / fi + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "appending firmware to cpio" cd "${TEMP}" @@ -491,6 +515,7 @@ append_gpg() { gen_die 'Could not extract gpg binary cache!' chmod a+x "${TEMP}/initramfs-gpg-temp/sbin/gpg" cd "${TEMP}/initramfs-gpg-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" rm -rf "${TEMP}/initramfs-gpg-temp" > /dev/null } @@ -543,6 +568,7 @@ append_modules() { print_list ${!group_modules} > "${TEMP}/initramfs-modules-${KV}-temp/e= tc/modules/${group}" done cd "${TEMP}/initramfs-modules-${KV}-temp/" + log_future_cpio_content find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing modules cpio" cd "${TEMP}" @@ -647,6 +673,7 @@ append_auxilary() { fi =20 cd "${TEMP}/initramfs-aux-temp/" + log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing auxilary cpio" cd "${TEMP}"