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 <gentoo-commits+bounces-424178-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RuJng-00043H-Pb
for garchives@archives.gentoo.org; Mon, 06 Feb 2012 08:19:49 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DF6ABE062B;
Mon, 6 Feb 2012 08:19:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id B1225E062B
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2012 08:19:36 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 35BF91B403D
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2012 08:19:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id E819080052
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2012 08:19:34 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <a871576d170277d935306a78acebf24a52103b65.robbat2@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: /
X-VCS-Repository: proj/genkernel
X-VCS-Files: ChangeLog gen_initramfs.sh
X-VCS-Directories: /
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: a871576d170277d935306a78acebf24a52103b65
Date: Mon, 6 Feb 2012 08:19:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: ff031a26-013b-4aa1-8307-e8044cd85a53
X-Archives-Hash: 7e6528eceb87b02eb1850e63a83d8714
commit: a871576d170277d935306a78acebf24a52103b65
Author: Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Mon Feb 6 08:00:32 2012 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 08:19:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git=
;a=3Dcommit;h=3Da871576d
Fix hardcoded paths in multipath support
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
ChangeLog | 3 +++
gen_initramfs.sh | 28 ++--------------------------
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5115896..0dec7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
# $Id$
=20
06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
+ Refactor multipath initramfs generation using copy_binaries.
+
+ 06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
copy_binaries utility function for putting binaries and librares into
initramfs (see git commit for full details).
=20
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b96e36e..02e6554 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -164,32 +164,8 @@ append_multipath(){
mkdir -p "${TEMP}/initramfs-multipath-temp/sbin/"
mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
=20
- # Copy files to /lib
- for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libdevmapper*so*,libp=
thread*,librt*,libreadline*,libncurses*}
- do
- cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die "Could not copy file ${i} for MULTIPATH"
- done
-
- for i in /usr/lib/libaio*
- do
- cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die "Could not copy file ${i} for MULTIPATH"
- done
-
- # Copy files to /sbin
- for i in /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib=
64/udev/scsi_id
- do
- cp -a "${i}" "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die "Could not copy file ${i} for MULTIPATH"
- done
-
- # Copy files to /bin
- for i in /bin/mountpoint
- do
- cp -a "${i}" "${TEMP}/initramfs-multipath-temp/bin" \
- || gen_die "Could not copy file ${i} for MULTIPATH"
- done
+ # Copy files
+ copy_binaries "${TEMP}/initramfs-multipath-temp" "$(echo /sbin/{multipa=
th,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id /bin/moun=
tpoint)"
=20
if [ -x /sbin/multipath ]
then