external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2596 from holta/holta-NetworkManager-detection

Browse source 
Fix $OS in scripts/local_facts.fact for Mint
This commit is contained in:
A Holt 2020-10-27 11:10:38 -07:00 • committed by GitHub
commit 8dc4266bfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/local_facts.fact
View file

@ -27,7 +27,9 @@ SYSTEMD_NETWORKD="none"
# doesn't exist, or (2) iiab.env exists but fails to set STAGE=<something>
source /etc/iiab/iiab.env || true # STAGE var auto-set, so no "if" required.
if tmp=$(grep ^ID= /etc/*elease); then
# /etc/lsb-release could also be grep'd. But /etc/upstream-release/lsb-release
# on Linux Mint 20 caused grep of /etc/*elease to fail (on directory not file)
if tmp=$(grep ^ID= /etc/os-release); then
OS=$(echo $tmp | cut -d= -f2)
OS=${OS//\"/} # Remove all '"'
fi
@ -35,8 +37,6 @@ if [ -f /etc/rpi-issue ]; then
OS="raspbian"
fi
# /etc/lsb-release could also be grep'd. But /etc/upstream-release/lsb-release
# on Linux Mint 20 caused grep of /etc/*elease to fail (on directory not file)
if tmp=$(grep ^VERSION_ID= /etc/os-release); then
VERSION_ID=$(echo $tmp | cut -d= -f2)
VERSION_ID=${VERSION_ID//\"/} # Remove all '"'