From fb566274af34f3a262830747aa92dd450682f8fd Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 25 May 2018 10:33:36 +0200 Subject: [PATCH] full_install: default RELEASE is ReleaseFOUR Change-Id: I66551a34aa3cfbe5ad64d6b6dc1a12884a196938 Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f3e005e1..cfbab579 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -819,7 +819,7 @@ SHOWOPTS="" COMMIT_ID="" ASSUME_YES="" INSTALL_FROM_SOURCE="" -RELEASE="-R ReleaseTHREE" +RELEASE="-R ReleaseFOUR" REPOSITORY="-r stable" INSTALL_VIMEMU="" INSTALL_FROM_LXDIMAGES="" @@ -909,6 +909,7 @@ done [ -n "$INSTALL_FROM_LXDIMAGES" ] && [ -n "$INSTALL_LIGHTWEIGHT" ] && FATAL "Incompatible options: --lxd can only be used with --soui" [ -n "$NAT" ] && [ -n "$INSTALL_LIGHTWEIGHT" ] && FATAL "Incompatible options: --nat can only be used with --soui" [ -n "$NOCONFIGURE" ] && [ -n "$INSTALL_LIGHTWEIGHT" ] && FATAL "Incompatible options: --noconfigure can only be used with --soui" +[ -n "$RELEASE_DAILY" ] && [ -n "$INSTALL_LIGHTWEIGHT" ] && FATAL "Incompatible options: --daily can only be used with --soui" [ -n "$INSTALL_NOLXD" ] && [ -z "$INSTALL_LIGHTWEIGHT" ] && FATAL "Incompatible option: --nolxd cannot be used with --soui" if [ -n "$SHOWOPTS" ]; then -- 2.25.1