[SCM] live-build branch, debian-next, updated. debian/3.0_a8-1-4-g7be98b8
Daniel Baumann
daniel at debian.org
Sun Dec 5 14:25:21 UTC 2010
The following commit has been merged in the debian-next branch:
commit 7be98b8ec2ab9346243aac6f7ac5972de4eff456
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Dec 5 15:24:53 2010 +0100
Making default argument guessing for non-debian systems a bit more robust.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5419ca1..da8cef4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -259,8 +259,14 @@ Set_defaults ()
LB_ARCHITECTURES="amd64"
;;
*)
- Echo_warning "Can't determine architecture, assuming i386"
- LB_ARCHITECTURES="i386"
+ if [ -e /lib64 ]
+ then
+ LB_ARCHITECTURES="amd64"
+ else
+ LB_ARCHITECTURES="i386"
+ fi
+
+ Echo_warning "Can't determine architecture, assuming ${LB_ARCHITECTURES}"
;;
esac
fi
--
live-build
More information about the debian-live-changes
mailing list