--- trunk/bootstrap/mage-bootstrap.sh 2010/06/28 17:22:52 1075 +++ trunk/bootstrap/mage-bootstrap.sh.in 2013/10/08 14:39:21 2180 @@ -80,11 +80,12 @@ enter_chroot() { mount -t proc proc ${MROOT}/proc || die "mount proc" + mount -t sysfs sysfs ${MROOT}/sys || die "mount sys" mount -o bind /dev ${MROOT}/dev || die "mount dev" chroot ${MROOT} /bin/bash -i /.installrc || die "chr00ting" - umount ${MROOT}/dev ${MROOT}/proc || die "mount proc/dev" + umount ${MROOT}/dev ${MROOT}/sys ${MROOT}/proc || die "mount proc/sys/dev" [ -f ${MROOT}/.installrc ] && rm ${MROOT}/.installrc } @@ -105,6 +106,7 @@ { is_loc_mounted "${MROOT}/dev" && umount ${MROOT}/dev is_loc_mounted "${MROOT}/proc" && umount ${MROOT}/proc + is_loc_mounted "${MROOT}/sys" && umount ${MROOT}/sys is_loc_mounted "${MY_MAGEDIR}" && umount ${MY_MAGEDIR} is_loc_mounted "${MY_PKGDIR}" && umount ${MY_PKGDIR} echo "bootstrap aborted" @@ -124,7 +126,7 @@ echo " --toolchain, -t -- select other toolchain than from profile" echo " --basesystem, -b -- select other basesystem than from profile" echo " --stage1, -s1 -- if set, abort after stage1 (toolchain)" - echo " --update-tarball, -ut -- update via tarball not rsync" + echo " --update-tarball, -ut -- update via tarball not rsync" echo " --no-update, -u -- do not update the mage tree" echo " --help, -h -- prints this help" echo @@ -148,8 +150,8 @@ --root|-r) shift; MROOT="$1" ;; --stage1|-s1) ABORT_AFTER_STAGE1=true ;; --magerc|-m) shift; MAGERC="$1" ;; - --update-tarball|-ut) shift; MAGEUPDATETARBALL=true ;; - --no-update|-u) shift; MAGEUPDATE=false ;; + --update-tarball|-ut) MAGEUPDATETARBALL=true ;; + --no-update|-u) MAGEUPDATE=false ;; --help|-h) print_usage ;; '') shift;; *) echo "Unkown option '$1', use --help or -h to get more info."; exit 1 ;;