projects
/
fbsd-stable-mgmt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
take a snapshot before upgrading
[fbsd-stable-mgmt.git]
/
update_stage1.sh
diff --git
a/update_stage1.sh
b/update_stage1.sh
index c4a04422d12c618671af0c54125a3eae7e15e38f..28ed57993d95688c8849ae9053d211bd31d33f07 100755
(executable)
--- 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
mountro=`zfs get -H readonly llroot/ROOT/master | cut -w -f 3`
[ ${mountro} = "on" ] && zfs_mount
-mergemaster -p
-cd /usr/src && \
-make installworld && \
-mergemaster -iF && \
-make delete-old && \
+usrsrc=${USRSRC:-/usr/src}
+
+etcupdate -p && \
+make -C ${usrsrc} installworld && \
+etcupdate && \
+make -C ${usrsrc} delete-old && \
echo "reboot to delete old libs"
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