romain-dartigues
/
cdist
forked from ungleich-public/cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP: support Linux Mint and LMDE 

Without this patch, Linux Mint and LMDE are detected as "debian" which,
somehow, does work, but do not take in consideration those distributions
specifics (such as mirror, upstream version, etc.).

This is flagged WIP as long as I do not run the tests on LMDE.
This commit is contained in:
Romain Dartigues 2021-12-27 14:41:37 +01:00
parent c2c5668b70
commit 3f69895046
47 changed files with 81 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cdist/conf/explorer/os
View File

@ -51,6 +51,13 @@ if grep -q ^DISTRIB_ID=Ubuntu /etc/lsb-release 2>/dev/null; then
exit 0 exit 0
fi fi
if grep -q ^DISTRIB_ID=LinuxMint /etc/lsb-release 2>/dev/null; then
echo linuxmint
exit 0
fi
#FIXME: Linux Mint Debian Edition/lmde
# devuan ascii has both devuan_version and debian_version, so we need to check devuan_version first! # devuan ascii has both devuan_version and debian_version, so we need to check devuan_version first!
if [ -f /etc/devuan_version ]; then if [ -f /etc/devuan_version ]; then
echo devuan echo devuan

4
cdist/conf/explorer/os_version
View File

@ -41,7 +41,7 @@ in
# empty, but well... # empty, but well...
cat /etc/arch-release cat /etc/arch-release
;; ;;
debian) debian|lmde)
debian_version=$(cat /etc/debian_version) debian_version=$(cat /etc/debian_version)
case $debian_version case $debian_version
in in
@ -134,7 +134,7 @@ in
cat /etc/SuSE-release cat /etc/SuSE-release
fi fi
;; ;;
ubuntu) ubuntu|linuxmint)
if command -v lsb_release >/dev/null 2>&1 if command -v lsb_release >/dev/null 2>&1
then then
lsb_release -sr lsb_release -sr

4
cdist/conf/type/__apt_backports/manifest
View File

@ -36,7 +36,7 @@ codename_os_release() {
# detect backport distribution # detect backport distribution
os="$(cat "$__global/explorer/os")" os="$(cat "$__global/explorer/os")"
case "$os" in case "$os" in
debian) debian|lmde)
dist="$( codename_os_release )" dist="$( codename_os_release )"
components="main" components="main"
mirror="http://deb.debian.org/debian/" mirror="http://deb.debian.org/debian/"
@ -46,7 +46,7 @@ case "$os" in
components="main" components="main"
mirror="http://deb.devuan.org/merged" mirror="http://deb.devuan.org/merged"
;; ;;
ubuntu) ubuntu|linuxmint)
dist="$( codename_os_release )" dist="$( codename_os_release )"
components="main restricted universe multiverse" components="main restricted universe multiverse"
mirror="http://archive.ubuntu.com/ubuntu" mirror="http://archive.ubuntu.com/ubuntu"

2
cdist/conf/type/__apt_default_release/manifest
View File

@ -24,7 +24,7 @@ os=$(cat "$__global/explorer/os")
release="$(cat "$__object/parameter/release")" release="$(cat "$__object/parameter/release")"
case "$os" in case "$os" in
ubuntu|debian|devuan) ubuntu|debian|devuan|linuxmint|lmde)
__file /etc/apt/apt.conf.d/99-default-release \ __file /etc/apt/apt.conf.d/99-default-release \
--owner root --group root --mode 644 \ --owner root --group root --mode 644 \
--source - << DONE --source - << DONE

2
cdist/conf/type/__apt_norecommends/manifest
View File

@ -24,7 +24,7 @@ os=$(cat "${__global:?}/explorer/os")
case ${os} case ${os}
in in
(ubuntu|debian|devuan) (ubuntu|debian|devuan|linuxmint|lmde)
__file /etc/apt/apt.conf.d/00InstallRecommends --state present \ __file /etc/apt/apt.conf.d/00InstallRecommends --state present \
--owner root --group root --mode 0644 --source - <<-'EOF' --owner root --group root --mode 0644 --source - <<-'EOF'
APT::Install-Recommends "false"; APT::Install-Recommends "false";

2
cdist/conf/type/__apt_pin/manifest
View File

@ -35,7 +35,7 @@ priority="$(cat "$__object/parameter/priority")"
case "$os" in case "$os" in
debian|ubuntu|devuan) debian|ubuntu|devuan|linux|lmde)
;; ;;
*) *)
printf "This type is specific to Debian and it's derivatives" >&2 printf "This type is specific to Debian and it's derivatives" >&2

2
cdist/conf/type/__consul/manifest
View File

@ -24,7 +24,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo) alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo|linuxmint|lmde)
# any linux should work # any linux should work
: :
;; ;;

5
cdist/conf/type/__consul_agent/manifest
View File

@ -58,6 +58,7 @@ esac
distribution_setup () { distribution_setup () {
case "$os" in case "$os" in
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
# consul is only available starting Debian 10 (buster). # consul is only available starting Debian 10 (buster).
# See https://packages.debian.org/buster/consul # See https://packages.debian.org/buster/consul
@ -136,7 +137,7 @@ init_upstart()
manual_setup () { manual_setup () {
case "$os" in case "$os" in
alpine|scientific|centos|debian|devuan|redhat|ubuntu) alpine|scientific|centos|debian|devuan|redhat|ubuntu|linuxmint|lmde)
# whitelist safeguard # whitelist safeguard
: :
;; ;;
@ -191,6 +192,7 @@ manual_setup () {
esac esac
;; ;;
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
os_version=$(cat "$__global/explorer/os_version") os_version=$(cat "$__global/explorer/os_version")
major_version="${os_version%%.*}" major_version="${os_version%%.*}"
@ -209,6 +211,7 @@ manual_setup () {
esac esac
;; ;;
#FIXME: Linux Mint
ubuntu) ubuntu)
init_upstart init_upstart
;; ;;

2
cdist/conf/type/__docker/manifest
View File

@ -44,7 +44,7 @@ case "$os" in
exit 1 exit 1
fi fi
;; ;;
ubuntu|debian) ubuntu|debian|linuxmint|lmde)
if [ "${state}" = "present" ]; then if [ "${state}" = "present" ]; then
__package apt-transport-https __package apt-transport-https
__package ca-certificates __package ca-certificates

3
cdist/conf/type/__firewalld_start/gencode-remote
View File

@ -45,6 +45,7 @@ if [ "$init" = 'systemd' ]; then
echo "systemctl \"$cmd\" \"$name\"" echo "systemctl \"$cmd\" \"$name\""
else else
case "$os" in case "$os" in
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
case "$os_version" in case "$os_version" in
[1-7]*) [1-7]*)
@ -72,7 +73,7 @@ else
echo "/etc/init.d/\"$name\" \"$cmd\"" echo "/etc/init.d/\"$name\" \"$cmd\""
;; ;;
ubuntu) ubuntu|linuxmint)
echo "service \"$name\" \"$cmd\"" echo "service \"$name\" \"$cmd\""
;; ;;

2
cdist/conf/type/__go_get/manifest
View File

@ -5,7 +5,7 @@ go_executable=$(cat "$__object/explorer/go-executable")
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case $os in case $os in
debian|devuan|ubuntu) debian|devuan|ubuntu|linuxmint|lmde)
__package build-essential __package build-essential
;; ;;
*) *)

1
cdist/conf/type/__grafana_dashboard/manifest
View File

@ -5,6 +5,7 @@ os_version=$(cat "$__global/explorer/os_version")
require="" require=""
case $os in case $os in
#FIXME: Linux Mint Debian Edition/lmde
debian|devuan) debian|devuan)
case $os_version in case $os_version in
8*|jessie) 8*|jessie)

2
cdist/conf/type/__hostname/gencode-remote
View File

@ -59,7 +59,7 @@ echo 'changed' >>"${__messages_out:?}"
# Use the good old way to set the hostname. # Use the good old way to set the hostname.
case ${os} case ${os}
in in
(alpine|debian|devuan|ubuntu) (alpine|debian|devuan|ubuntu|linuxmint|lmde)
echo 'hostname -F /etc/hostname' echo 'hostname -F /etc/hostname'
;; ;;
(archlinux) (archlinux)

2
cdist/conf/type/__hostname/manifest
View File

@ -56,7 +56,7 @@ fi
case ${os} case ${os}
in in
(alpine|debian|devuan|ubuntu|void) (alpine|debian|devuan|ubuntu|void|linuxmint|lmde)
echo "${name_should}" | __file /etc/hostname --source - echo "${name_should}" | __file /etc/hostname --source -
;; ;;
(archlinux) (archlinux)

5
cdist/conf/type/__hwclock/manifest
View File

@ -104,11 +104,12 @@ in
unset CDIST_ORDER_DEPENDENCY unset CDIST_ORDER_DEPENDENCY
fi fi
;; ;;
(debian|devuan|ubuntu) (debian|devuan|ubuntu|linuxmint|lmde)
os_major=$(sed 's/[^0-9].*$//' "${__global:?}/explorer/os_version") os_major=$(sed 's/[^0-9].*$//' "${__global:?}/explorer/os_version")
case ${os} case ${os}
in in
#FIXME: Linux Mint Debian Edition/lmde
(debian) (debian)
if test "${os_major}" -ge 7 if test "${os_major}" -ge 7
then then
@ -129,7 +130,7 @@ in
(devuan) (devuan)
update_rcS=false update_rcS=false
;; ;;
(ubuntu) (ubuntu|linuxmint)
update_rcS=$(test "${os_major}" -lt 16 && echo true || echo false) update_rcS=$(test "${os_major}" -lt 16 && echo true || echo false)
;; ;;
esac esac

7
cdist/conf/type/__install_bootloader_grub/explorer/target_os
View File

@ -48,6 +48,13 @@ if grep -q ^DISTRIB_ID=Ubuntu "$chroot/etc/lsb-release" 2>/dev/null; then
exit 0 exit 0
fi fi
if grep -q ^DISTRIB_ID=LinuxMint "$chroot/etc/lsb-release" 2>/dev/null; then
echo linuxmint
exit 0
fi
#FIXME: Linux Mint Debian Edition/lmde
if [ -f "$chroot/etc/debian_version" ]; then if [ -f "$chroot/etc/debian_version" ]; then
echo debian echo debian
exit 0 exit 0

2
cdist/conf/type/__install_bootloader_grub/gencode-remote
View File

@ -34,7 +34,7 @@ exec > "$install_script"
printf '#!/bin/sh -l\n' printf '#!/bin/sh -l\n'
case "$target_os" in case "$target_os" in
ubuntu|debian) ubuntu|debian|linuxmint|lmde)
if [ -s "$__global/explorer/efi" ]; then if [ -s "$__global/explorer/efi" ]; then
# FIXME: untested. maybe also just run update-grub for EFI system? # FIXME: untested. maybe also just run update-grub for EFI system?
printf 'grub-mkconfig --output=/boot/efi/EFI/%s/grub.cfg\n' "$target_os" printf 'grub-mkconfig --output=/boot/efi/EFI/%s/grub.cfg\n' "$target_os"

3
cdist/conf/type/__letsencrypt_cert/manifest
View File

@ -15,6 +15,7 @@ if [ -z "${certbot_fullpath}" ]; then
alpine) alpine)
__package certbot __package certbot
;; ;;
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
case "$os_version" in case "$os_version" in
8*) 8*)
@ -88,7 +89,7 @@ if [ -z "${certbot_fullpath}" ]; then
__package py37-certbot __package py37-certbot
certbot_fullpath="/usr/local/bin/certbot" certbot_fullpath="/usr/local/bin/certbot"
;; ;;
ubuntu) ubuntu|linuxmint)
__package certbot __package certbot
;; ;;
*) *)

3
cdist/conf/type/__locale/manifest
View File

@ -26,11 +26,12 @@ os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
#FIXME: Linux Mint Debian Edition/lmde
debian|devuan) debian|devuan)
# Debian needs a seperate package # Debian needs a seperate package
__package locales --state present __package locales --state present
;; ;;
archlinux|suse|ubuntu|scientific|centos|alpine) archlinux|suse|ubuntu|scientific|centos|alpine|linuxmint)
: :
;; ;;
*) *)

3
cdist/conf/type/__locale_system/manifest
View File

@ -55,6 +55,7 @@ os=$(cat "$__global/explorer/os")
case $os case $os
in in
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
if version_ge 4 <"${__global}/explorer/os_version" if version_ge 4 <"${__global}/explorer/os_version"
then then
@ -67,7 +68,7 @@ in
devuan) devuan)
locale_conf="/etc/default/locale" locale_conf="/etc/default/locale"
;; ;;
ubuntu) ubuntu|linuxmint)
if version_ge 6.10 <"${__global}/explorer/os_version" if version_ge 6.10 <"${__global}/explorer/os_version"
then then
# Ubuntu 6.10 (edgy) and later # Ubuntu 6.10 (edgy) and later

2
cdist/conf/type/__localedef/gencode-remote
View File

@ -61,7 +61,7 @@ in
printf '%s does not support locales.\n' "${os}" >&2 printf '%s does not support locales.\n' "${os}" >&2
exit 1 exit 1
;; ;;
(archlinux|debian|devuan|ubuntu|suse|centos|fedora|redhat|scientific) (archlinux|debian|devuan|ubuntu|suse|centos|fedora|redhat|scientific|linuxmint|lmde)
# FIXME: The code below only works for glibc-based installations. # FIXME: The code below only works for glibc-based installations.
# NOTE: Hardcoded, create a pull request in case it is at another # NOTE: Hardcoded, create a pull request in case it is at another

2
cdist/conf/type/__localedef/manifest
View File

@ -24,7 +24,7 @@
case $(cat "${__global:?}/explorer/os") case $(cat "${__global:?}/explorer/os")
in in
(debian|devuan) (debian|devuan|lmde)
__package_apt locales --state present __package_apt locales --state present
;; ;;
esac esac

4
cdist/conf/type/__openldap_server/manifest
View File

@ -37,7 +37,7 @@ case "${os}" in
tls_cipher_suite="HIGH:MEDIUM:+SSLv2" tls_cipher_suite="HIGH:MEDIUM:+SSLv2"
fi fi
;; ;;
debian|ubuntu|devuan) debian|ubuntu|devuan|linuxmint|lmde)
PKGS="slapd ldap-utils" PKGS="slapd ldap-utils"
ETC="/etc" ETC="/etc"
SLAPD_DIR="/etc/ldap" SLAPD_DIR="/etc/ldap"
@ -157,7 +157,7 @@ case "${os}" in
--comment "# LDAP Listener URLs" \ --comment "# LDAP Listener URLs" \
"${__target_host}__slapd_flags" "${__target_host}__slapd_flags"
;; ;;
debian|ubuntu|devuan) debian|ubuntu|devuan|linuxmint|lmde)
require="__package/${PKG_MAIN}" __line rm_slapd_conf \ require="__package/${PKG_MAIN}" __line rm_slapd_conf \
--file ${ETC}/default/slapd \ --file ${ETC}/default/slapd \
--regex 'SLAPD_CONF=.*' \ --regex 'SLAPD_CONF=.*' \

2
cdist/conf/type/__package/manifest
View File

@ -33,7 +33,7 @@ else
case "$os" in case "$os" in
amazon|scientific|centos|fedora|redhat) type="yum" ;; amazon|scientific|centos|fedora|redhat) type="yum" ;;
archlinux) type="pacman" ;; archlinux) type="pacman" ;;
debian|ubuntu|devuan) type="apt" ;; debian|ubuntu|devuan|linuxmint|lmde) type="apt" ;;
freebsd) freebsd)
if [ -n "$(cat "$__object/explorer/pkgng_exists")" ]; then if [ -n "$(cat "$__object/explorer/pkgng_exists")" ]; then
type="pkgng_freebsd" type="pkgng_freebsd"

2
cdist/conf/type/__package_update_index/explorer/type
View File

@ -24,7 +24,7 @@ else
os="$("$__explorer/os")" os="$("$__explorer/os")"
case "$os" in case "$os" in
amazon|scientific|centos|fedora|redhat) echo "yum" ;; amazon|scientific|centos|fedora|redhat) echo "yum" ;;
debian|ubuntu|devuan) echo "apt" ;; debian|ubuntu|devuan|linuxmint|lmde) echo "apt" ;;
archlinux) echo "pacman" ;; archlinux) echo "pacman" ;;
alpine) echo "apk" ;; alpine) echo "apk" ;;
*) *)

2
cdist/conf/type/__package_upgrade_all/gencode-remote
View File

@ -39,7 +39,7 @@ else
os="$(cat "$__global/explorer/os")" os="$(cat "$__global/explorer/os")"
case "$os" in case "$os" in
amazon|scientific|centos|fedora|redhat) type="yum" ;; amazon|scientific|centos|fedora|redhat) type="yum" ;;
debian|ubuntu|devuan) type="apt" ;; debian|ubuntu|devuan|linuxmint|lmde) type="apt" ;;
archlinux) type="pacman" ;; archlinux) type="pacman" ;;
*) *)
echo "Don't know how to manage packages on: $os" >&2 echo "Don't know how to manage packages on: $os" >&2

2
cdist/conf/type/__postfix_master/manifest
View File

@ -22,7 +22,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
ubuntu|debian|archlinux|scientific|centos|devuan) ubuntu|debian|archlinux|scientific|centos|devuan|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__postfix_postconf/explorer/value
View File

@ -22,7 +22,7 @@
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
alpine|ubuntu|debian|archlinux|suse|scientific|centos|devuan) alpine|ubuntu|debian|archlinux|suse|scientific|centos|devuan|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__postfix_postconf/gencode-remote
View File

@ -22,7 +22,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
alpine|archlinux|centos|debian|devuan|suse|scientific|ubuntu) alpine|archlinux|centos|debian|devuan|suse|scientific|ubuntu|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__postfix_reload/gencode-remote
View File

@ -22,7 +22,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
ubuntu|debian|archlinux|scientific|centos|devuan) ubuntu|debian|archlinux|scientific|centos|devuan|linuxmint|lmde)
echo "postfix reload" echo "postfix reload"
;; ;;
*) *)

2
cdist/conf/type/__postgres_conf/explorer/postgres_user
View File

@ -29,7 +29,7 @@ in
(centos|rhel|scientific) (centos|rhel|scientific)
echo 'postgres' echo 'postgres'
;; ;;
(debian|devuan|ubuntu) (debian|devuan|ubuntu|linuxmint|lmde)
echo 'postgres' echo 'postgres'
;; ;;
(freebsd) (freebsd)

2
cdist/conf/type/__sensible_editor/explorer/editor_path
View File

@ -39,7 +39,7 @@ test "$(cat "${__object}/parameter/state")" != 'absent' || exit 0
case $("${__explorer}/os") case $("${__explorer}/os")
in in
debian|devuan|ubuntu) debian|devuan|ubuntu|linuxmint|lmde)
has_alternatives=true has_alternatives=true
# NOTE: Old versions do not support `--list`, in this case ignore the errors. # NOTE: Old versions do not support `--list`, in this case ignore the errors.

2
cdist/conf/type/__sensible_editor/manifest
View File

@ -57,7 +57,7 @@ package_name='sensible-utils'
case $os case $os
in in
debian) debian|linuxmint|lmde)
pkg_type='apt' pkg_type='apt'
;; ;;
devuan) devuan)

2
cdist/conf/type/__sshd_config/manifest
View File

@ -24,7 +24,7 @@ state_should=$(cat "${__object:?}/parameter/state")
case ${os} case ${os}
in in
(alpine|centos|fedora|redhat|scientific|debian|devuan|ubuntu) (alpine|centos|fedora|redhat|scientific|debian|devuan|ubuntu|linuxmint|lmde)
if test "${state_should}" != 'absent' if test "${state_should}" != 'absent'
then then
__package openssh-server --state present __package openssh-server --state present

4
cdist/conf/type/__start_on_boot/explorer/state
View File

@ -37,7 +37,7 @@ if [ "$init" = 'systemd' ]; then
else else
case "$os" in case "$os" in
debian|openwrt|devuan) debian|openwrt|devuan|lmde)
state="absent" state="absent"
for file in "/etc/rc$runlevel.d/S"??"$name" for file in "/etc/rc$runlevel.d/S"??"$name"
do do
@ -48,7 +48,7 @@ else
fi fi
done done
;; ;;
ubuntu) ubuntu|linuxmint)
state="absent" state="absent"
for file in "/etc/rc$runlevel.d/S"??"$name" for file in "/etc/rc$runlevel.d/S"??"$name"
do do

3
cdist/conf/type/__start_on_boot/gencode-remote
View File

@ -40,6 +40,7 @@ case "$state_should" in
echo "systemctl -q enable '$name'" echo "systemctl -q enable '$name'"
else else
case "$os" in case "$os" in
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
case "$os_version" in case "$os_version" in
[1-7]*) [1-7]*)
@ -73,7 +74,7 @@ case "$state_should" in
echo "'/etc/init.d/$name' enable || [ -f /etc/rc.d/S??'$name' ]" echo "'/etc/init.d/$name' enable || [ -f /etc/rc.d/S??'$name' ]"
;; ;;
ubuntu) ubuntu|linuxmint)
echo "update-rc.d '$name' defaults >/dev/null" echo "update-rc.d '$name' defaults >/dev/null"
;; ;;

2
cdist/conf/type/__sysctl/gencode-remote
View File

@ -30,7 +30,7 @@ fi
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
# Linux # Linux
redhat|centos|ubuntu|debian|devuan|archlinux|gentoo|coreos) redhat|centos|ubuntu|debian|devuan|archlinux|gentoo|coreos|linuxmint|lmde)
flag='-w' flag='-w'
;; ;;
# BusyBox # BusyBox

2
cdist/conf/type/__sysctl/manifest
View File

@ -25,7 +25,7 @@ os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
# Linux # Linux
alpine|redhat|centos|ubuntu|debian|devuan|archlinux|coreos) alpine|redhat|centos|ubuntu|debian|devuan|archlinux|coreos|linuxmint|lmde)
: :
;; ;;
# BSD # BSD

2
cdist/conf/type/__timezone/gencode-remote
View File

@ -30,7 +30,7 @@ if [ "$timezone_is" = "$timezone_should" ]; then
fi fi
case "$os" in case "$os" in
ubuntu|debian|devuan|coreos|alpine) ubuntu|debian|devuan|coreos|alpine|linuxmint|lmde)
echo "echo \"$timezone_should\" > /etc/timezone" echo "echo \"$timezone_should\" > /etc/timezone"
;; ;;
esac esac

2
cdist/conf/type/__timezone/manifest
View File

@ -26,7 +26,7 @@ timezone=$(cat "$__object/parameter/tz")
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
archlinux|debian|ubuntu|devuan|alpine) archlinux|debian|ubuntu|devuan|alpine|linuxmint|lmde)
__package tzdata __package tzdata
export require="__package/tzdata" export require="__package/tzdata"
;; ;;

4
cdist/conf/type/__unpack/manifest
View File

@ -20,7 +20,7 @@ case "$src" in
;; ;;
*.lzma|*.xz|*.txz) *.lzma|*.xz|*.txz)
case "$os" in case "$os" in
debian|ubuntu|devuan) debian|ubuntu|devuan|linuxmint|lmde)
__package xz-utils __package xz-utils
;; ;;
alpine|centos) alpine|centos)
@ -30,7 +30,7 @@ case "$src" in
;; ;;
*.rar) *.rar)
case "$os" in case "$os" in
debian|ubuntu|devuan|alpine|freebsd) debian|ubuntu|devuan|alpine|freebsd|linuxmint|lmde)
__package unrar __package unrar
;; ;;
esac esac

2
cdist/conf/type/__xymon_apache/gencode-remote
View File

@ -21,7 +21,7 @@ state=$(cat "$__object/parameter/state")
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
debian|ubuntu) debian|ubuntu|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__xymon_apache/manifest
View File

@ -21,7 +21,7 @@ state=$(cat "$__object/parameter/state")
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
debian|ubuntu) debian|ubuntu|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__xymon_client/manifest
View File

@ -22,7 +22,7 @@ servers=$(cat "$__object/parameter/servers")
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
debian|ubuntu) debian|ubuntu|linuxmint|lmde)
: :
;; ;;
*) *)

2
cdist/conf/type/__xymon_server/manifest
View File

@ -26,7 +26,7 @@ fi
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
debian|ubuntu) debian|ubuntu|linuxmint|lmde)
: :
;; ;;
*) *)

7
cdist/test/autil/fixtures/explorer/os
View File

@ -50,6 +50,13 @@ if grep -q ^DISTRIB_ID=Ubuntu /etc/lsb-release 2>/dev/null; then
exit 0 exit 0
fi fi
if grep -q ^DISTRIB_ID=LinuxMint /etc/lsb-release 2>/dev/null; then
echo linuxmint
exit 0
fi
#FIXME: Linux Mint Debian Edition/lmde
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
echo debian echo debian
exit 0 exit 0

3
cdist/test/autil/fixtures/explorer/os_version
View File

@ -30,6 +30,7 @@ case "$($__explorer/os)" in
# empty, but well... # empty, but well...
cat /etc/arch-release cat /etc/arch-release
;; ;;
#FIXME: Linux Mint Debian Edition/lmde
debian) debian)
cat /etc/debian_version cat /etc/debian_version
;; ;;
@ -67,7 +68,7 @@ case "$($__explorer/os)" in
cat /etc/SuSE-release cat /etc/SuSE-release
fi fi
;; ;;
ubuntu) ubuntu|linuxmint)
lsb_release -sr lsb_release -sr
;; ;;
esac esac