Package: live-package Version: 0.99.23-1
when LIVE_SERVER_PATH and LIVE_CHROOT basenames are the same, we end up moving binary/ inside $LIVE_CHROOT and when we build the tarball in lh_buildbinary net) case, that's the chroot tree + binary one that is used instead of only the binary one. At first I suggest checking the basename's collision before doing anything. That Checkenv sub could be used in the future for some other sanity checks. Cheers -- Mathieu --- make-live 2007-02-21 22:10:15.000000000 +0100 +++ make-live.new 2007-02-24 14:05:59.000000000 +0100 @@ -170,6 +170,18 @@ } +Checkenv () +{ + if [ -n "${LIVE_CHROOT}" ] && [ -n "${LIVE_SERVER_PATH}" ]; then + if [ "`basename ${LIVE_CHROOT}`" == "`basename ${LIVE_SERVER_PATH}`" ]; then + echo "${LIVE_SERVER_PATH} ${LIVE_CHROOT}" + echo "collision between basename LIVE_SERVER_PATH and basename LIVE_CHROOT"; + echo "you may want to change that in your conf." + exit 1; + fi + fi +} + Main () { ARGUMENTS="`getopt --longoptions root:,tasks:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,encryption:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-daemons,without-daemons,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:e:f:k:m:o:p:s:huv --shell sh -- "[EMAIL PROTECTED]"`" @@ -410,6 +422,7 @@ lh_testroot Configuration Defaults + Checkenv # Building live system lh_cdebootstrap -- Mathieu -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]