Compare commits
8 commits
master
...
rd/clear-l
Author | SHA1 | Date | |
---|---|---|---|
a8cf54e462 | |||
41309043c6 | |||
21055f2779 | |||
bbd1ba6bb7 | |||
382cdcaa33 | |||
88bb561288 | |||
d1ae8942da | |||
7d590225af |
15 changed files with 171 additions and 6 deletions
|
@ -138,7 +138,7 @@ in
|
||||||
cat /etc/SuSE-release
|
cat /etc/SuSE-release
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
ubuntu)
|
clear-linux-os|ubuntu)
|
||||||
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
|
||||||
|
|
|
@ -44,6 +44,21 @@ case "$os" in
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
clear-linux-os)
|
||||||
|
if [ "${state}" = present ]
|
||||||
|
then
|
||||||
|
if [ "$version" != latest ]
|
||||||
|
then
|
||||||
|
>&2 echo "Specifying Docker version is unsupported with \"$os\""
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
__package_swupd cloud-control
|
||||||
|
else
|
||||||
|
>&2 echo 'Warning: cowardly refusing to remove "cloud-control", disabling Dockerd instead'
|
||||||
|
__systemd_service docker --state stopped
|
||||||
|
__systemd_unit docker --enablement-state disabled
|
||||||
|
fi
|
||||||
|
;;
|
||||||
ubuntu|debian)
|
ubuntu|debian)
|
||||||
if [ "${state}" = "present" ]; then
|
if [ "${state}" = "present" ]; then
|
||||||
__package apt-transport-https
|
__package apt-transport-https
|
||||||
|
|
|
@ -156,7 +156,7 @@ in
|
||||||
locale_conf_mode=0555
|
locale_conf_mode=0555
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
slackware)
|
clear-linux-os|slackware)
|
||||||
# NOTE: lang.csh (csh config) is ignored here.
|
# NOTE: lang.csh (csh config) is ignored here.
|
||||||
locale_conf="/etc/profile.d/lang.sh"
|
locale_conf="/etc/profile.d/lang.sh"
|
||||||
locale_conf_mode=0755
|
locale_conf_mode=0755
|
||||||
|
|
|
@ -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|clear-linux-os)
|
||||||
# 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
|
||||||
|
|
|
@ -34,6 +34,7 @@ else
|
||||||
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) type="apt" ;;
|
||||||
|
clear-linux-os) type="swupd" ;;
|
||||||
freebsd)
|
freebsd)
|
||||||
if [ -n "$(cat "$__object/explorer/pkgng_exists")" ]; then
|
if [ -n "$(cat "$__object/explorer/pkgng_exists")" ]; then
|
||||||
type="pkgng_freebsd"
|
type="pkgng_freebsd"
|
||||||
|
|
29
cdist/conf/type/__package_swupd/explorer/state
Normal file
29
cdist/conf/type/__package_swupd/explorer/state
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Retrieve the status of a package on Clear Linux OS
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/name" ]
|
||||||
|
then name="$(cat "$__object/parameter/name")"
|
||||||
|
else name="$__object_id"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if swupd bundle-list --status --quiet | grep -q "^${name}: .*installed"
|
||||||
|
then echo present
|
||||||
|
else echo absent
|
||||||
|
fi
|
50
cdist/conf/type/__package_swupd/gencode-remote
Executable file
50
cdist/conf/type/__package_swupd/gencode-remote
Executable file
|
@ -0,0 +1,50 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Manage packages on Clear Linux OS
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/name" ]; then
|
||||||
|
name="$(cat "$__object/parameter/name")"
|
||||||
|
else
|
||||||
|
name="$__object_id"
|
||||||
|
fi
|
||||||
|
|
||||||
|
state_should="$(cat "$__object/parameter/state")"
|
||||||
|
state_is="$(cat "$__object/explorer/state")"
|
||||||
|
|
||||||
|
# Nothing to be done
|
||||||
|
[ "$state_is" = "$state_should" ] && exit 0
|
||||||
|
|
||||||
|
case "$state_should" in
|
||||||
|
present)
|
||||||
|
if [ -f "$__object/parameter/install-optional" ]
|
||||||
|
then swupd_opts=""
|
||||||
|
else swupd_opts="--skip-optional"
|
||||||
|
fi
|
||||||
|
echo "swupd bundle-add $swupd_opts -y --quiet '$name'"
|
||||||
|
echo "installed" >> "$__messages_out"
|
||||||
|
;;
|
||||||
|
absent)
|
||||||
|
echo "swupd bundle-remove '$name'"
|
||||||
|
echo "removed" >> "$__messages_out"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown state: $state_should" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
66
cdist/conf/type/__package_swupd/man.rst
Normal file
66
cdist/conf/type/__package_swupd/man.rst
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
cdist-type__package_swupd(7)
|
||||||
|
============================
|
||||||
|
|
||||||
|
NAME
|
||||||
|
----
|
||||||
|
cdist-type__package_swupd - Manage packages with swupd
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
-----------
|
||||||
|
swupd (software update program) is the package manager used on Clear Linux OS to
|
||||||
|
manage packages. The package will be installed without optional
|
||||||
|
packages. If such packages are required, install them
|
||||||
|
separately or use the parameter ``--install-optional``.
|
||||||
|
|
||||||
|
|
||||||
|
REQUIRED PARAMETERS
|
||||||
|
-------------------
|
||||||
|
None
|
||||||
|
|
||||||
|
|
||||||
|
OPTIONAL PARAMETERS
|
||||||
|
-------------------
|
||||||
|
name
|
||||||
|
If supplied, use the name and not the object id as the package name.
|
||||||
|
|
||||||
|
state
|
||||||
|
Either "present" or "absent", defaults to "present"
|
||||||
|
|
||||||
|
|
||||||
|
BOOLEAN PARAMETERS
|
||||||
|
------------------
|
||||||
|
install-optional
|
||||||
|
If the package will be installed, it also installs optional packages
|
||||||
|
with it. It will not install optional packages if the original package
|
||||||
|
is already installed.
|
||||||
|
|
||||||
|
|
||||||
|
EXAMPLES
|
||||||
|
--------
|
||||||
|
|
||||||
|
.. code-block:: sh
|
||||||
|
|
||||||
|
# Ensure zsh in installed
|
||||||
|
__package_swupd zsh --state present
|
||||||
|
|
||||||
|
# Remove package
|
||||||
|
__package_swupd zsh --state absent
|
||||||
|
|
||||||
|
|
||||||
|
SEE ALSO
|
||||||
|
--------
|
||||||
|
:strong:`cdist-type__package`\ (7)
|
||||||
|
|
||||||
|
|
||||||
|
AUTHORS
|
||||||
|
-------
|
||||||
|
Romain Dartigues <romain.dartigues+cdist at gmail.com>
|
||||||
|
|
||||||
|
|
||||||
|
COPYING
|
||||||
|
-------
|
||||||
|
Copyright \(C) 2024 Romain Dartigues. You can redistribute it
|
||||||
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
0
cdist/conf/type/__package_swupd/nonparallel
Normal file
0
cdist/conf/type/__package_swupd/nonparallel
Normal file
1
cdist/conf/type/__package_swupd/parameter/boolean
Normal file
1
cdist/conf/type/__package_swupd/parameter/boolean
Normal file
|
@ -0,0 +1 @@
|
||||||
|
install-optional
|
1
cdist/conf/type/__package_swupd/parameter/default/state
Normal file
1
cdist/conf/type/__package_swupd/parameter/default/state
Normal file
|
@ -0,0 +1 @@
|
||||||
|
present
|
2
cdist/conf/type/__package_swupd/parameter/optional
Normal file
2
cdist/conf/type/__package_swupd/parameter/optional
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
name
|
||||||
|
state
|
|
@ -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|clear-linux-os|fedora|redhat|scientific|debian|devuan|ubuntu)
|
||||||
if test "${state_should}" != 'absent'
|
if test "${state_should}" != 'absent'
|
||||||
then
|
then
|
||||||
__package openssh-server --state present
|
__package openssh-server --state present
|
||||||
|
|
|
@ -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|clear-linux-os)
|
||||||
flag='-w'
|
flag='-w'
|
||||||
;;
|
;;
|
||||||
# BusyBox
|
# BusyBox
|
||||||
|
|
|
@ -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|clear-linux-os)
|
||||||
:
|
:
|
||||||
;;
|
;;
|
||||||
# BSD
|
# BSD
|
||||||
|
|
Loading…
Reference in a new issue