From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 501D21381FB for ; Sun, 11 Nov 2012 17:32:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9284A21C01B; Sun, 11 Nov 2012 17:32:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 177F421C010 for ; Sun, 11 Nov 2012 17:32:04 +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 258E033D986 for ; Sun, 11 Nov 2012 17:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 89B90E5448 for ; Sun, 11 Nov 2012 17:32:01 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1352654838.f72ef39985a6905f9b694b98d71ae37f6be2c637.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: f72ef39985a6905f9b694b98d71ae37f6be2c637 X-VCS-Branch: ryao Date: Sun, 11 Nov 2012 17:32: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 X-Archives-Salt: fc5fc6fa-70b6-473d-ae31-c9846f2afc45 X-Archives-Hash: 19ee4255a569fda4d44e17867c062598 commit: f72ef39985a6905f9b694b98d71ae37f6be2c637 Author: Richard Yao cs stonybrook edu> AuthorDate: Sun Nov 11 17:27:18 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Sun Nov 11 17:27:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f72ef399 Use busybox blkdid Signed-off-by: Richard Yao cs.stonybrook.edu> --- gen_initramfs.sh | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 99bd3f3..14b24a3 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -145,26 +145,6 @@ append_e2fsprogs(){ rm -rf "${TEMP}"/initramfs-e2fsprogs-temp > /dev/null } -append_blkid(){ - if [ -d "${TEMP}/initramfs-blkid-temp" ] - then - rm -r "${TEMP}/initramfs-blkid-temp/" - fi - cd ${TEMP} - mkdir -p "${TEMP}/initramfs-blkid-temp/" - - if [[ "${DISKLABEL}" = "1" ]]; then - copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid - fi - - cd "${TEMP}/initramfs-blkid-temp/" - log_future_cpio_content - find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ - || gen_die "compressing blkid cpio" - cd "${TEMP}" - rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null -} - #append_fuse() { # if [ -d "${TEMP}/initramfs-fuse-temp" ] # then @@ -780,8 +760,6 @@ create_initramfs() { append_data 'zfs' "${ZFS}" - append_data 'blkid' "${DISKLABEL}" - append_data 'unionfs_fuse' "${UNIONFS}" append_data 'splash' "${SPLASH}"