aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2009-03-06 07:44:22 -0600
committerAndrew Gaffney <agaffney@gentoo.org>2009-03-06 07:44:22 -0600
commit109770b762c15d3f4feea638d01ed31156fac83f (patch)
tree2fab22679b6adef8d44f491f2c9f99392c29271c /gen_initramfs.sh
parentApply patch from robbat2 to fix whitespace breakage in multipath code (diff)
downloadgenkernel-109770b762c15d3f4feea638d01ed31156fac83f.tar.gz
genkernel-109770b762c15d3f4feea638d01ed31156fac83f.tar.bz2
genkernel-109770b762c15d3f4feea638d01ed31156fac83f.zip
Clean up append_multipath() code to copy files in a loop and report file that failed to copy
Diffstat (limited to 'gen_initramfs.sh')
-rwxr-xr-xgen_initramfs.sh48
1 files changed, 22 insertions, 26 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b9df15..111b6cc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -135,32 +135,28 @@ append_multipath(){
mkdir -p "${TEMP}/initramfs-multipath-temp/etc/"
mkdir -p "${TEMP}/initramfs-multipath-temp/sbin/"
mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
- cp -a /lib/ld-* "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /lib/libsysfs*so* "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /lib/libdevmapper*so* "${TEMP}/initramfs-multipath-temp/lib" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/multipath "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/kpartx "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/mpath_prio_* "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /lib64/udev/scsi_id "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/devmap_name "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /sbin/dmsetup "${TEMP}/initramfs-multipath-temp/sbin" \
- || gen_die 'Could not copy files for MULTIPATH!'
- cp -a /bin/mountpoint "${TEMP}/initramfs-multipath-temp/bin" \
- || gen_die 'Could not copy files for MULTIPATH!'
+
+ # Copy files to /lib
+ for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libsysfs*so*,libdevmapper*so*}
+ 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} /lib64/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
+
if [ -x /sbin/multipath ]
then
cp /etc/multipath.conf "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy /etc/multipath.conf please check this'