--- trunk/bootstrap/scripts/mage-bootstrap.sh 2006/02/23 16:47:13 340 +++ trunk/bootstrap/scripts/mage-bootstrap.sh 2007/01/22 21:46:31 422 @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /home/cvsd/magellan-cvs/magellan-src/bootstrap/scripts/mage-bootstrap.sh,v 1.5 2006-02-23 16:47:13 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/bootstrap/scripts/mage-bootstrap.sh,v 1.6 2007-01-22 21:46:31 niro Exp $ TOOLCHAIN="" BASESYSTEM="" @@ -192,13 +192,13 @@ # TOOLCHAIN="$(< /etc/mage-profile/${TOOLCHAIN})" # BASESYSTEM="$(< /etc/mage-profile/${BASESYSTEM})" -# this way toolchain and basesytem can be packages; +# this way toolchain and basesystem can be packages; # only if nothing set the layout files from the profile will be taken [ -z "${TOOLCHAIN}" ] && TOOLCHAIN="$(< /etc/mage-profile/toolchain.defaults)" [ -z "${BASESYSTEM}" ] && BASESYSTEM="$(< /etc/mage-profile/basesystem.defaults)" # install toolchain -CONFIG_PROTECT="-*" MROOT="${MROOT}" mage install ${TOOLCHAIN} || die "toolchain install" +CONFIG_PROTECT="-*" MROOT="${MROOT}" MAGERC="${MAGERC}" mage install ${TOOLCHAIN} || die "toolchain install" # umount dirs, they are not needed anymore umount ${MY_MAGEDIR} ${MY_PKGDIR} || die "umount mage/pkgdir" @@ -217,6 +217,7 @@ # now create an initrc for the installation of the basesystem :> ${MROOT}/.installrc +add_initrc "export MAGE_BOOTSTRAP=true" add_initrc "export HOME=/root" add_initrc "export PATH=/bin:/usr/bin:/sbin:/usr/sbin" add_initrc "export BASESYSTEM=${BASESYSTEM}" @@ -239,6 +240,4 @@ enter_chroot echo "System bootstrap to '${MROOT}' finished." - exit 0 -