Adjust runtime detection to properly work with LXC hosts

LXC hosts don't have decimal point

Thanks: Ondřej Surý
remotes/origin/debian/stretch
Michael Prokop 10 years ago
parent 96fe9fe79d
commit 16f0ba5565

@ -1,7 +1,7 @@
#!/bin/bash
start_seconds=$(cut -d . -f 1 /proc/uptime)
[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown"
start_seconds=$(sed -e 's/^\([0-9]*\).*/\1/' < /proc/uptime)
[ -n "$start_seconds" ] && SECONDS="$[$(sed -e 's/^\([0-9]*\).*/\1/' < /proc/uptime)-$start_seconds]" || SECONDS="unknown"
if [ -r /var/lib/jenkins/config.xml ] ; then
echo "Configuration file /var/lib/jenkins/config.xml exists already." >&2
@ -98,7 +98,7 @@ $IP $(hostname).example.org $(hostname)
fi
if puppet apply jenkins_debian_glue.pp ; then
[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown"
[ -n "$start_seconds" ] && SECONDS="$[$(sed -e 's/^\([0-9]*\).*/\1/' < /proc/uptime)-$start_seconds]" || SECONDS="unknown"
echo "jenkins-debian-glue deployment finished after ${SECONDS} seconds."
else
echo "Fatal error during puppet run. :(" >&2

@ -15,7 +15,7 @@ PATH='/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin'
export QEMU_RESERVED_VA=0x0
echo "*** Starting $0 at $(date) ***"
start_seconds=$(cut -d . -f 1 /proc/uptime)
start_seconds=$(sed -e 's/^\([0-9]*\).*/\1/' < /proc/uptime)
JENKINS_DEBIAN_GLUE_VERSION=$(dpkg --list jenkins-debian-glue 2>/dev/null | awk '/^ii/ {print $3}')
if [ -n "${JENKINS_DEBIAN_GLUE_VERSION:-}" ] ; then
@ -170,7 +170,7 @@ bailout() {
${SUDO_CMD:-} rm -rf /tmp/apt-$$
[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]" || SECONDS="unknown"
[ -n "$start_seconds" ] && SECONDS="$[$(sed -e 's/^\([0-9]*\).*/\1/' < /proc/uptime)-$start_seconds]" || SECONDS="unknown"
echo "*** Finished execution of $0 at $(date) [running ${SECONDS} seconds] ***"
exit $EXIT

Loading…
Cancel
Save