[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: fixup dsa-check-running-kernel to deal with the latest ubuntu LTS changes…
Holger Levsen
holger at layer-acht.org
Fri Jan 5 10:17:06 UTC 2018
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit 2f97093a35afd7163ee6bc8646689206c33dbe62
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri Jan 5 10:16:45 2018 +0000
reproducible Debian: fixup dsa-check-running-kernel to deal with the latest ubuntu LTS changes…
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
hosts/bbx15-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/bpi0-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/cb3a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/cbxi4a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/cbxi4b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/ff2a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/ff2b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/ff4a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/ff64a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/hb0-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jenkins-test-vm/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jenkins/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jtk1b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jtx1a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jtx1b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/jtx1c-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/odu3a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/odxu4a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/odxu4b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/odxu4c-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/opi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/opi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/p64b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/p64c-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
.../usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/rpi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/rpi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/wbd0-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
hosts/wbq0-armhf-rb/usr/local/bin/dsa-check-running-kernel | 12 ++++++++++--
51 files changed, 510 insertions(+), 102 deletions(-)
diff --git a/hosts/bbx15-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/bbx15-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/bbx15-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/bbx15-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/bpi0-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/bpi0-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/bpi0-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/bpi0-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/cb3a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/cb3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/cb3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/cb3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/cbxi4a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/cbxi4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/cbxi4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/cbxi4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/cbxi4b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/cbxi4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/cbxi4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/cbxi4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/cbxi4pro0-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/cbxi4pro0-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/cbxi4pro0-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/cbxi4pro0-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled10-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled10-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled10-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled10-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled11-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled11-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled11-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled11-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled12-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled12-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled12-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled12-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled13-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled13-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled13-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled13-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled14-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled14-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled14-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled14-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled15-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled15-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled15-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled15-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/codethink-sled16-arm64/usr/local/bin/dsa-check-running-kernel b/hosts/codethink-sled16-arm64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/codethink-sled16-arm64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/codethink-sled16-arm64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/ff2a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/ff2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/ff2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/ff2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/ff2b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/ff2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/ff2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/ff2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/ff4a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/ff4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/ff4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/ff4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/ff64a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/ff64a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/ff64a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/ff64a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/hb0-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/hb0-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/hb0-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/hb0-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jenkins-test-vm/usr/local/bin/dsa-check-running-kernel b/hosts/jenkins-test-vm/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jenkins-test-vm/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jenkins-test-vm/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jenkins/usr/local/bin/dsa-check-running-kernel b/hosts/jenkins/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jenkins/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jenkins/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jtk1b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtk1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jtk1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jtk1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jtx1a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtx1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jtx1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jtx1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jtx1b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtx1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jtx1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jtx1b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/jtx1c-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtx1c-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/jtx1c-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/jtx1c-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/odu3a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/odu3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/odu3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/odu3a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/odxu4a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/odxu4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/odxu4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/odxu4a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/odxu4b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/odxu4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/odxu4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/odxu4b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/odxu4c-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/odxu4c-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/odxu4c-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/odxu4c-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/opi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/opi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/opi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/opi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/opi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/opi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/opi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/opi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/p64b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/p64b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/p64b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/p64b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/p64c-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/p64c-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/p64c-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/p64c-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build1-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build1-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build1-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build1-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build10-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build10-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build10-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build10-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build11-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build11-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build11-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build11-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build12-i386/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build12-i386/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build12-i386/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build12-i386/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build15-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build15-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build15-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build15-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build16-i386/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build16-i386/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build16-i386/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build16-i386/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build2-i386/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build2-i386/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build2-i386/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build2-i386/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build3-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build3-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build3-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build3-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build4-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build4-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build4-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build4-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build5-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build5-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build5-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build5-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build6-i386/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build6-i386/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build6-i386/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build6-i386/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build7-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build7-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build7-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build7-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/profitbricks-build9-amd64/usr/local/bin/dsa-check-running-kernel b/hosts/profitbricks-build9-amd64/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/profitbricks-build9-amd64/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/profitbricks-build9-amd64/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/rpi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/rpi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/rpi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/rpi2b-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/rpi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/rpi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/rpi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/rpi2c-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/wbd0-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/wbd0-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/wbd0-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/wbd0-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
diff --git a/hosts/wbq0-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/wbq0-armhf-rb/usr/local/bin/dsa-check-running-kernel
index aa6e35b..6eaa514 100755
--- a/hosts/wbq0-armhf-rb/usr/local/bin/dsa-check-running-kernel
+++ b/hosts/wbq0-armhf-rb/usr/local/bin/dsa-check-running-kernel
@@ -201,8 +201,13 @@ for on_disk in \
fi
[ -z "$on_disk_version" ] || break
on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
+ if [ -x /usr/bin/lsb_release ] ; then
+ vendor=$(lsb_release -i -s)
+ if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+ on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+ fi
+ fi
[ -z "$on_disk_version" ] || break
-
echo "UNKNOWN: Failed to get a version string from image $on_disk"
exit $UNKNOWN
else
@@ -225,7 +230,10 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
if [ "$running_version" != "$on_disk_version" ]; then
- echo "WARNING: Running kernel does not match on-disk kernel image: [$running_version != $on_disk_version]"
+ echo "WARNING: Running kernel does not match on-disk kernel image:"
+ echo " $running_version"
+ echo "!="
+ echo " $on_disk_version"
exit $WARNING
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list