aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcraig <craig@haquarter.de>2009-08-08 14:41:29 +0200
committercraig <craig@haquarter.de>2009-08-08 14:41:29 +0200
commit5019ff506fbcefa4f5929bf54d0a29c562177612 (patch)
tree11df86c5a99049fe21eea2a8ccf0307c3772c713 /gen_initramfs.sh
parentCorrected spelling -> iSCSI (diff)
parentAdding Id header and Ident for genkernel.conf (diff)
downloadgenkernel-5019ff506fbcefa4f5929bf54d0a29c562177612.tar.gz
genkernel-5019ff506fbcefa4f5929bf54d0a29c562177612.tar.bz2
genkernel-5019ff506fbcefa4f5929bf54d0a29c562177612.zip
Merge branch 'master' of git://git.wolf31o2.org/projs/genkernel
Diffstat (limited to 'gen_initramfs.sh')
-rwxr-xr-xgen_initramfs.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 979994a..9f66b71 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# $Id$
CPIO_ARGS="--quiet -o -H newc"
@@ -217,7 +218,12 @@ append_lvm(){
cd ${TEMP}
mkdir -p "${TEMP}/initramfs-lvm-temp/bin/"
mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/"
- if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
+ if [ -e '/sbin/lvm.static' ]
+ then
+ print_info 1 ' LVM: Adding support (using local static binaries)...'
+ cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" ||
+ gen_die 'Could not copy over lvm!'
+ elif [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
then
print_info 1 ' LVM: Adding support (using local static binaries)...'
cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" ||