Skip to content

Commit 5b32d1a

Browse files
committed
detect-environment: Moved version detection to detect_os
For some reason the version detection for FreeBSD and HP-UX was in the detect_arch function. However, it belongs in the detect_os function. Ticket: ENT-12600 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent 5b74437 commit 5b32d1a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build-scripts/detect-environment

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ detect_os()
7979
FreeBSD)
8080
OS_FAMILY=freebsd
8181
OS=freebsd
82+
OS_VERSION=$UNAME_R
8283
;;
8384
NetBSD)
8485
OS_FAMILY=netbsd
@@ -87,6 +88,7 @@ detect_os()
8788
HP-UX)
8889
OS_FAMILY=hpux
8990
OS=hpux
91+
OS_VERSION=$UNAME_R
9092
;;
9193
*)
9294
echo "Unable to detect operating system: $UNAME_S"
@@ -295,11 +297,9 @@ detect_arch()
295297

296298
freebsd)
297299
ARCH=$UNAME_M
298-
OS_VERSION=$UNAME_R
299300
;;
300301
hpux)
301302
ARCH=$UNAME_M
302-
OS_VERSION=$UNAME_R
303303
;;
304304
*)
305305
echo "Unknown packaging system"

0 commit comments

Comments
 (0)