installer.sh: x86_64: support copying files from /lib64

This commit is contained in:
Silvan Calarco 2013-02-06 16:42:43 +01:00
parent 2a75e59cf8
commit 9a30136d91

View File

@ -323,14 +323,16 @@ echo -n $"Copying files..."
dcop_write $"Copying files..." 15 dcop_write $"Copying files..." 15
prog=15 prog=15
for d in etc bin boot lib opt sbin srv usr var root; do for d in etc bin boot lib lib64 opt sbin srv usr var root; do
[ ! "$INSTALL_CLONE_MODE" == "1" -a -e /squashfs/$d ] && canonical_dir=/squashfs/$d || canonical_dir=`readlink -f /$d` [ ! "$INSTALL_CLONE_MODE" == "1" -a -e /squashfs/$d ] && canonical_dir=/squashfs/$d || canonical_dir=`readlink -f /$d`
[ -e $canonical_dir ] || continue
DIR_SPACE=`du -sxm $canonical_dir | awk '{ print $1; }'` DIR_SPACE=`du -sxm $canonical_dir | awk '{ print $1; }'`
TOTAL_SPACE=`expr $TOTAL_SPACE + $DIR_SPACE` TOTAL_SPACE=`expr $TOTAL_SPACE + $DIR_SPACE`
done done
for d in etc bin boot lib opt sbin srv usr var root; do for d in etc bin boot lib lib64 opt sbin srv usr var root; do
[ ! "$INSTALL_CLONE_MODE" == "1" -a -e /squashfs/$d ] && canonical_dir=/squashfs/$d || canonical_dir=`readlink -f /$d` [ ! "$INSTALL_CLONE_MODE" == "1" -a -e /squashfs/$d ] && canonical_dir=/squashfs/$d || canonical_dir=`readlink -f /$d`
[ -e $canonical_dir ] || continue
cp -av $canonical_dir $MOUNTPOINT/ | cp_parser || { cp -av $canonical_dir $MOUNTPOINT/ | cp_parser || {
echo $"Error: cannot copy $canonical_dir to $MOUNTPOINT; aborting." >&2 echo $"Error: cannot copy $canonical_dir to $MOUNTPOINT; aborting." >&2
abort abort