X-Git-Url: http://popeye.lapinbilly.eu/git/?p=fbsd-stable-mgmt.git;a=blobdiff_plain;f=update_stage1.sh;h=d85ecbf126f45ce850f93a6fef06de6cdfd92763;hp=c4a04422d12c618671af0c54125a3eae7e15e38f;hb=bfdb9e2902824daac3bb23631b2f254303f7cabb;hpb=53c05a1bbd3e8aca4b111f99faf45732fb258110 diff --git a/update_stage1.sh b/update_stage1.sh index c4a0442..d85ecbf 100755 --- a/update_stage1.sh +++ b/update_stage1.sh @@ -11,10 +11,13 @@ adjkerntz -i mountro=`zfs get -H readonly llroot/ROOT/master | cut -w -f 3` [ ${mountro} = "on" ] && zfs_mount -mergemaster -p -cd /usr/src && \ -make installworld && \ +usrsrc=${USRSRC:-/usr/src} + +mergemaster -p && \ +make -C ${usrsrc} installworld && \ mergemaster -iF && \ -make delete-old && \ +make -C ${usrsrc} delete-old && \ echo "reboot to delete old libs" +# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old +# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old-libs