From d8adf78cc8dd65d9d7ff2390c7dabb786cad25e0 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 13 Dec 2004 16:54:00 +0000 Subject: [PATCH] Clifford Wolf: Don't re-run Check-System in chroot [2004121015204527149] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5198 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 1 + scripts/Check-System | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 87150914c..293762e52 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -130,6 +130,7 @@ if [ $# = 0 ] ; then fi ./scripts/Check-System || exit 1 +export ROCK_CHECK_SYSTEM_OK=1 . ./scripts/functions . ./scripts/parse-config diff --git a/scripts/Check-System b/scripts/Check-System index 4cd90c18c..bb2c411ad 100755 --- a/scripts/Check-System +++ b/scripts/Check-System @@ -34,6 +34,10 @@ fi found_error=0 paranoia="" +if [ "$ROCK_CHECK_SYSTEM_OK" = 1 ]; then + exit 0 +fi + if [ "$1" = "-paranoia" ]; then paranoia=1 fi @@ -151,3 +155,4 @@ if [ $found_error -ne 0 ] ; then fi exit $found_error +