Magellan Linux

Diff of /trunk/bootstrap/mage-bootstrap.sh.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/bootstrap/mage-bootstrap.sh revision 1485 by niro, Thu Aug 4 13:09:44 2011 UTC trunk/bootstrap/mage-bootstrap.sh.in revision 2191 by niro, Wed Oct 9 10:32:55 2013 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # $Header: /home/cvsd/magellan-cvs/magellan-src/bootstrap/scripts/mage-bootstrap.sh,v 1.8 2008-06-23 19:26:40 niro Exp $  # $Id$
3    
4  TOOLCHAIN=""  TOOLCHAIN=""
5  BASESYSTEM=""  BASESYSTEM=""
# Line 80  add_initrc() Line 80  add_initrc()
80  enter_chroot()  enter_chroot()
81  {  {
82   mount -t proc proc ${MROOT}/proc || die "mount proc"   mount -t proc proc ${MROOT}/proc || die "mount proc"
83     mount -t sysfs sysfs ${MROOT}/sys || die "mount sys"
84   mount -o bind /dev ${MROOT}/dev || die "mount dev"   mount -o bind /dev ${MROOT}/dev || die "mount dev"
85    
86   chroot ${MROOT} /bin/bash -i /.installrc || die "chr00ting"   chroot ${MROOT} /bin/bash -i /.installrc || die "chr00ting"
87    
88   umount ${MROOT}/dev ${MROOT}/proc || die "mount proc/dev"   umount ${MROOT}/dev ${MROOT}/sys ${MROOT}/proc || die "mount proc/sys/dev"
89    
90   [ -f ${MROOT}/.installrc ] && rm ${MROOT}/.installrc   [ -f ${MROOT}/.installrc ] && rm ${MROOT}/.installrc
91  }  }
# Line 105  trap_exit() Line 106  trap_exit()
106  {  {
107   is_loc_mounted "${MROOT}/dev" && umount ${MROOT}/dev   is_loc_mounted "${MROOT}/dev" && umount ${MROOT}/dev
108   is_loc_mounted "${MROOT}/proc" && umount ${MROOT}/proc   is_loc_mounted "${MROOT}/proc" && umount ${MROOT}/proc
109     is_loc_mounted "${MROOT}/sys" && umount ${MROOT}/sys
110   is_loc_mounted "${MY_MAGEDIR}" && umount ${MY_MAGEDIR}   is_loc_mounted "${MY_MAGEDIR}" && umount ${MY_MAGEDIR}
111   is_loc_mounted "${MY_PKGDIR}" && umount ${MY_PKGDIR}   is_loc_mounted "${MY_PKGDIR}" && umount ${MY_PKGDIR}
112   echo "bootstrap aborted"   echo "bootstrap aborted"
# Line 148  do Line 150  do
150   --root|-r) shift; MROOT="$1" ;;   --root|-r) shift; MROOT="$1" ;;
151   --stage1|-s1) ABORT_AFTER_STAGE1=true ;;   --stage1|-s1) ABORT_AFTER_STAGE1=true ;;
152   --magerc|-m) shift; MAGERC="$1" ;;   --magerc|-m) shift; MAGERC="$1" ;;
153   --update-tarball|-ut) shift; MAGEUPDATETARBALL=true ;;   --update-tarball|-ut) MAGEUPDATETARBALL=true ;;
154   --no-update|-u) shift; MAGEUPDATE=false ;;   --no-update|-u) MAGEUPDATE=false ;;
155   --help|-h) print_usage ;;   --help|-h) print_usage ;;
156   '') shift;;   '') shift;;
157   *) echo "Unkown option '$1', use --help or -h to get more info."; exit 1 ;;   *) echo "Unkown option '$1', use --help or -h to get more info."; exit 1 ;;
# Line 214  fi Line 216  fi
216  [ -z "${BASESYSTEM}" ] && BASESYSTEM="$(< ${MY_MAGEDIR}/profiles/${PROFILE}/basesystem.defaults)"  [ -z "${BASESYSTEM}" ] && BASESYSTEM="$(< ${MY_MAGEDIR}/profiles/${PROFILE}/basesystem.defaults)"
217    
218  # install toolchain  # install toolchain
219  CONFIG_PROTECT="-*" MROOT="${MROOT}" MAGERC="${MAGERC}" mage install ${TOOLCHAIN} || die "toolchain install"  if ! MROOT="${MROOT}" MAGERC="${MAGERC}" magequery -n ${TOOLCHAIN}
220    then
221     CONFIG_PROTECT="-*" MROOT="${MROOT}" MAGERC="${MAGERC}" mage install ${TOOLCHAIN} || die "toolchain install"
222    fi
223    
224  # umount dirs, they are not needed anymore  # umount dirs, they are not needed anymore
225  umount ${MY_MAGEDIR} ${MY_PKGDIR} || die "umount mage/pkgdir"  umount ${MY_MAGEDIR} ${MY_PKGDIR} || die "umount mage/pkgdir"

Legend:
Removed from v.1485  
changed lines
  Added in v.2191