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 1075 by niro, Mon Jun 28 17:22:52 2010 UTC trunk/bootstrap/mage-bootstrap.sh.in revision 2180 by niro, Tue Oct 8 14:39:21 2013 UTC
# 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 124  print_usage() Line 126  print_usage()
126   echo " --toolchain,      -t  --  select other toolchain than from profile"   echo " --toolchain,      -t  --  select other toolchain than from profile"
127   echo " --basesystem,     -b  --  select other basesystem than from profile"   echo " --basesystem,     -b  --  select other basesystem than from profile"
128   echo " --stage1,         -s1 --  if set, abort after stage1 (toolchain)"   echo " --stage1,         -s1 --  if set, abort after stage1 (toolchain)"
129   echo "  --update-tarball, -ut -- update via tarball not rsync"   echo " --update-tarball, -ut --  update via tarball not rsync"
130   echo " --no-update,      -u  --  do not update the mage tree"   echo " --no-update,      -u  --  do not update the mage tree"
131   echo " --help,           -h  --  prints this help"   echo " --help,           -h  --  prints this help"
132   echo   echo
# 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 ;;

Legend:
Removed from v.1075  
changed lines
  Added in v.2180