scripts

commit 33d39f5f75df2b659a536768cfecce3b259ee73f
parent efc8b38339d88ae0b88dacbc091f1db1ab672be5
Author: sin <sin@2f30.org>
Date:   Mon, 13 Feb 2017 10:59:27 +0000

Don't automatically run sysmerge on world rebuild

Make it a separate flag instead.

Diffstat:
M
sysbuild
 | 
11
++++-------

1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sysbuild b/sysbuild
@@ -5,9 +5,7 @@
 # Typical usage:
 #
 # sysbuild k && reboot
-# sysbuild w x && reboot
-
-finalize=0
+# sysbuild w x f && reboot
 
 upgradekernel() {
 	rm -rf /usr/obj/sys
@@ -45,10 +43,11 @@ finish() {
 
 usage() {
 cat << EOF
-usage: upgrade-obsd [k] [w] [x]
+usage: upgrade-obsd [k] [w] [x] [f]
 k  Upgrade kernel
 w  Upgrade world
 x  Upgrade xenocara
+f  Finalize upgrade
 EOF
 exit 1
 }
@@ -58,9 +57,7 @@ for arg in "$@"; do
 	k) upgradekernel ;;
 	w) upgradeworld ;;
 	x) upgradexenocara ;;
+	f) finish ;;
 	*) usage ;;
 	esac
 done
-
-test "$finalize" -eq 1 && finish
-exit 0