Skip to content

Commit 6140837

Browse files
committed
More specific detecting of Ubuntu OS. Closes hestiacp#246.
1 parent a93a094 commit 6140837

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bin/v-list-sys-info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [ -e '/etc/redhat-release' ]; then
3232
fi
3333
VERSION=$(cat /etc/redhat-release | tr ' ' '\n' |grep [0-9])
3434
else
35-
if [ -e '/etc/lsb-release' ] && [ -e '/etc/debian_version' ]; then
35+
if [ "$(lsb_release -si)" == "Ubuntu" ] && [ -e '/etc/debian_version' ]; then
3636
OS="Ubuntu"
3737
VERSION=$(grep DISTRIB_RELEASE /etc/lsb-release| cut -f 2 -d '=')
3838
else

install/vst-install-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if [ "x$(id -u)" != 'x0' ]; then
9595
fi
9696

9797
# Check supported version
98-
if [ -e '/etc/redhat-release' ] || [ -e '/etc/lsb-release' ]; then
98+
if [ -e '/etc/redhat-release' ] || [ "$(lsb_release -si)" == "Ubuntu" ]; then
9999
echo 'Error: sorry, this installer works only on Debian 7'
100100
exit 1
101101
fi

install/vst-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if [ -e '/etc/redhat-release' ]; then
4242
type="rhel"
4343
fi
4444

45-
if [ -e '/etc/lsb-release' ] && [ -e '/etc/debian_version' ]; then
45+
if [ "$(lsb_release -si)" == "Ubuntu" ] && [ -e '/etc/debian_version' ]; then
4646
type="ubuntu"
4747
fi
4848

0 commit comments

Comments
 (0)