diff options
| author | Guido Berhoerster <guido+freiesoftware@berhoerster.name> | 2023-09-20 07:55:34 +0200 |
|---|---|---|
| committer | Guido Berhoerster <guido+freiesoftware@berhoerster.name> | 2023-09-20 08:20:47 +0200 |
| commit | 93aff9368d340baf04dd2c3d2c2e9245b18dd322 (patch) | |
| tree | 0e0e692daf54df72379cc269d512b49f0b90d36d | |
| parent | 417ffdd480ecde0b533b963a29e21bc847585cb4 (diff) | |
| download | debian-edu-fai+itzks-93aff9368d340baf04dd2c3d2c2e9245b18dd322.tar.gz debian-edu-fai+itzks-93aff9368d340baf04dd2c3d2c2e9245b18dd322.tar.bz2 debian-edu-fai+itzks-93aff9368d340baf04dd2c3d2c2e9245b18dd322.zip | |
Improve OS detection for loading profiles
Use /etc/os-release which should be available on modern distros.
| -rwxr-xr-x | fai/config/class/40-parse-profiles.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fai/config/class/40-parse-profiles.sh b/fai/config/class/40-parse-profiles.sh index fd13f9b..ac3d850 100755 --- a/fai/config/class/40-parse-profiles.sh +++ b/fai/config/class/40-parse-profiles.sh @@ -116,14 +116,8 @@ prtresult() { newclasses="${arclasses[$res]}" } -# a very simple OS + version detection mechanism, only usable on Debian -# nfsroots for now... -OS_SUFFIX="" -if [ -e "/etc/debian_version" ]; then - OS_SUFFIX+="DEBIAN" - OS_VERSION_MAJOR="$(head -n1 /etc/debian_version | cut -d"." -f1)" - OS_SUFFIX+="_${OS_VERSION_MAJOR}" -fi +# a very simple OS + version detection mechanism +OS_SUFFIX="$(source /etc/os-release 2>/dev/null && printf "%s_%s" "${ID^^}" "${VERSION_ID}")" # read all files with name matching *.profile _parsed=0 |