mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
systemctl-native: Rewrite in Python supporting preset-all and mask
Rewrite systemctl-native in Python so that extending/testing it is easier. Now that the systemd class sets up service presets instead of actively enabling services, the 'enable' and 'disable' subcommands for systemctl are not actually used anywhere. As such, we can remove these to make sure that nobody inadvertently introduces new uses of them. This implementation covers `preset-all` and `mask` which are the only options used in the current code, but should be readily extensible to other commands. We use `preset-all` at image construction time to populate the symlinks used by systemd. (From OE-Core rev: 86f5a2383692ac1ab01dce534c1a5c5f32ec4b35) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
committed by
Richard Purdie
Richard Purdie
parent
bc2ca0ea7e
commit
925e30cb10
@@ -1,196 +1,280 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env python3
|
||||||
echo "Started $0 $*"
|
"""systemctl: subset of systemctl used for image construction
|
||||||
|
|
||||||
ROOT=
|
Mask/preset systemd units
|
||||||
|
"""
|
||||||
|
|
||||||
# parse command line params
|
import argparse
|
||||||
action=
|
import fnmatch
|
||||||
while [ $# != 0 ]; do
|
import os
|
||||||
opt="$1"
|
import re
|
||||||
|
import sys
|
||||||
|
|
||||||
case "$opt" in
|
from collections import namedtuple
|
||||||
enable)
|
from pathlib import Path
|
||||||
shift
|
|
||||||
|
|
||||||
action="$opt"
|
version = 1.0
|
||||||
services="$1"
|
|
||||||
cmd_args="1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
disable)
|
|
||||||
shift
|
|
||||||
|
|
||||||
action="$opt"
|
ROOT = Path("/")
|
||||||
services="$1"
|
SYSCONFDIR = Path("etc")
|
||||||
cmd_args="1"
|
BASE_LIBDIR = Path("lib")
|
||||||
shift
|
LIBDIR = Path("usr", "lib")
|
||||||
;;
|
|
||||||
mask)
|
|
||||||
shift
|
|
||||||
|
|
||||||
action="$opt"
|
|
||||||
services="$1"
|
|
||||||
cmd_args="1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
preset)
|
|
||||||
shift
|
|
||||||
|
|
||||||
action="$opt"
|
class SystemdFile():
|
||||||
services="$1"
|
"""Class representing a single systemd configuration file"""
|
||||||
cmd_args="1"
|
def __init__(self, root, path):
|
||||||
shift
|
self.sections = dict()
|
||||||
;;
|
self._parse(root, path)
|
||||||
--root=*)
|
|
||||||
ROOT=${opt##--root=}
|
|
||||||
cmd_args="0"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if [ "$cmd_args" = "1" ]; then
|
|
||||||
services="$services $opt"
|
|
||||||
shift
|
|
||||||
else
|
|
||||||
echo "'$opt' is an unkown option; exiting with error"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
if [ "$action" = "preset" -a "$service_file" = "" ]; then
|
|
||||||
services=$(for f in `find $ROOT/etc/systemd/system $ROOT/lib/systemd/system $ROOT/usr/lib/systemd/system -type f 2>1`; do basename $f; done)
|
|
||||||
services="$services $opt"
|
|
||||||
presetall=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
for service in $services; do
|
def _parse(self, root, path):
|
||||||
if [ "$presetall" = "1" ]; then
|
"""Parse a systemd syntax configuration file
|
||||||
action="preset"
|
|
||||||
fi
|
|
||||||
if [ "$action" = "mask" ]; then
|
|
||||||
if [ ! -d $ROOT/etc/systemd/system/ ]; then
|
|
||||||
mkdir -p $ROOT/etc/systemd/system/
|
|
||||||
fi
|
|
||||||
cmd="ln -s /dev/null $ROOT/etc/systemd/system/$service"
|
|
||||||
echo "$cmd"
|
|
||||||
$cmd
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
service_base_file=`echo $service | sed 's/\(@\).*\(\.[^.]\+\)/\1\2/'`
|
Args:
|
||||||
if [ -z `echo $service | sed '/@/p;d'` ]; then
|
path: A pathlib.Path object pointing to the file
|
||||||
echo "Try to find location of $service..."
|
|
||||||
service_template=false
|
|
||||||
else
|
|
||||||
echo "Try to find location of template $service_base_file of instance $service..."
|
|
||||||
service_template=true
|
|
||||||
instance_specified=`echo $service | sed 's/^.\+@\(.*\)\.[^.]\+/\1/'`
|
|
||||||
fi
|
|
||||||
|
|
||||||
# find service file
|
"""
|
||||||
for p in $ROOT/etc/systemd/system \
|
skip_re = re.compile(r"^\s*([#;]|$)")
|
||||||
$ROOT/lib/systemd/system \
|
section_re = re.compile(r"^\s*\[(?P<section>.*)\]")
|
||||||
$ROOT/usr/lib/systemd/system; do
|
kv_re = re.compile(r"^\s*(?P<key>[^\s]+)\s*=\s*(?P<value>.*)")
|
||||||
if [ -e $p/$service_base_file ]; then
|
section = None
|
||||||
service_file=$p/$service_base_file
|
|
||||||
service_file=${service_file##$ROOT}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -z "$service_file" ]; then
|
|
||||||
echo "'$service_base_file' couldn't be found; exiting with error"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Found $service in $service_file"
|
|
||||||
|
|
||||||
# If any new unit types are added to systemd they should be added
|
if path.is_symlink():
|
||||||
# to this regular expression.
|
try:
|
||||||
unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|target\.wants\|path\|timer\|snapshot\)\s*$'
|
path.resolve()
|
||||||
if [ "$action" = "preset" ]; then
|
except FileNotFoundError:
|
||||||
action=`egrep -sh $service $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '`
|
# broken symlink, try relative to root
|
||||||
if [ -z "$action" ]; then
|
path = root / Path(os.readlink(str(path))).relative_to(ROOT)
|
||||||
globalpreset=`egrep -sh '\*' $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '`
|
|
||||||
if [ -n "$globalpreset" ]; then
|
|
||||||
action="$globalpreset"
|
|
||||||
else
|
|
||||||
action="enable"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# create the required symbolic links
|
|
||||||
wanted_by=$(sed '/^WantedBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
|
|
||||||
| tr ',' '\n' \
|
|
||||||
| grep "$unit_types_re")
|
|
||||||
|
|
||||||
required_by=$(sed '/^RequiredBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
|
with path.open() as f:
|
||||||
| tr ',' '\n' \
|
for line in f:
|
||||||
| grep "$unit_types_re")
|
if skip_re.match(line):
|
||||||
|
continue
|
||||||
|
|
||||||
for dependency in WantedBy RequiredBy; do
|
line = line.rstrip("\n")
|
||||||
if [ "$dependency" = "WantedBy" ]; then
|
m = section_re.match(line)
|
||||||
suffix="wants"
|
if m:
|
||||||
dependency_list="$wanted_by"
|
section = dict()
|
||||||
elif [ "$dependency" = "RequiredBy" ]; then
|
self.sections[m.group('section')] = section
|
||||||
suffix="requires"
|
continue
|
||||||
dependency_list="$required_by"
|
|
||||||
fi
|
|
||||||
for r in $dependency_list; do
|
|
||||||
echo "$dependency=$r found in $service"
|
|
||||||
if [ -n "$instance_specified" ]; then
|
|
||||||
# substitute wildcards in the dependency
|
|
||||||
r=`echo $r | sed "s/%i/$instance_specified/g"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$action" = "enable" ]; then
|
while line.endswith("\\"):
|
||||||
enable_service=$service
|
line += f.readline().rstrip("\n")
|
||||||
if [ "$service_template" = true -a -z "$instance_specified" ]; then
|
|
||||||
default_instance=$(sed '/^DefaultInstance[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file")
|
|
||||||
if [ -z $default_instance ]; then
|
|
||||||
echo "Template unit without instance or DefaultInstance directive, nothing to enable"
|
|
||||||
continue
|
|
||||||
else
|
|
||||||
echo "Found DefaultInstance $default_instance, enabling it"
|
|
||||||
enable_service=$(echo $service | sed "s/@/@$(echo $default_instance | sed 's/\\/\\\\/g')/")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
mkdir -p $ROOT/etc/systemd/system/$r.$suffix
|
|
||||||
ln -s $service_file $ROOT/etc/systemd/system/$r.$suffix/$enable_service
|
|
||||||
echo "Enabled $enable_service for $r."
|
|
||||||
else
|
|
||||||
if [ "$service_template" = true -a -z "$instance_specified" ]; then
|
|
||||||
disable_service="$ROOT/etc/systemd/system/$r.$suffix/`echo $service | sed 's/@/@*/'`"
|
|
||||||
else
|
|
||||||
disable_service="$ROOT/etc/systemd/system/$r.$suffix/$service"
|
|
||||||
fi
|
|
||||||
rm -f $disable_service
|
|
||||||
[ -d $ROOT/etc/systemd/system/$r.$suffix ] && rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.$suffix
|
|
||||||
echo "Disabled ${disable_service##$ROOT/etc/systemd/system/$r.$suffix/} for $r."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
# create the required symbolic 'Alias' links
|
m = kv_re.match(line)
|
||||||
alias=$(sed '/^Alias[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
|
k = m.group('key')
|
||||||
| tr ',' '\n' \
|
v = m.group('value')
|
||||||
| grep "$unit_types_re")
|
if k not in section:
|
||||||
|
section[k] = list()
|
||||||
|
section[k].extend(v.split())
|
||||||
|
|
||||||
for r in $alias; do
|
def get(self, section, prop):
|
||||||
if [ "$action" = "enable" ]; then
|
"""Get a property from section
|
||||||
mkdir -p $ROOT/etc/systemd/system
|
|
||||||
ln -s $service_file $ROOT/etc/systemd/system/$r
|
|
||||||
echo "Enabled $service for $alias."
|
|
||||||
else
|
|
||||||
rm -f $ROOT/etc/systemd/system/$r
|
|
||||||
echo "Disabled $service for $alias."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# call us for the other required scripts
|
Args:
|
||||||
also=$(sed '/^Also[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
|
section: Section to retrieve property from
|
||||||
| tr ',' '\n')
|
prop: Property to retrieve
|
||||||
for a in $also; do
|
|
||||||
echo "Also=$a found in $service"
|
Returns:
|
||||||
if [ "$action" = "enable" ]; then
|
List representing all properties of type prop in section.
|
||||||
$0 --root=$ROOT enable $a
|
|
||||||
fi
|
Raises:
|
||||||
done
|
KeyError: if ``section`` or ``prop`` not found
|
||||||
done
|
"""
|
||||||
|
return self.sections[section][prop]
|
||||||
|
|
||||||
|
|
||||||
|
class Presets():
|
||||||
|
"""Class representing all systemd presets"""
|
||||||
|
def __init__(self, scope, root):
|
||||||
|
self.directives = list()
|
||||||
|
self._collect_presets(scope, root)
|
||||||
|
|
||||||
|
def _parse_presets(self, presets):
|
||||||
|
"""Parse presets out of a set of preset files"""
|
||||||
|
skip_re = re.compile(r"^\s*([#;]|$)")
|
||||||
|
directive_re = re.compile(r"^\s*(?P<action>enable|disable)\s+(?P<unit_name>(.+))")
|
||||||
|
|
||||||
|
Directive = namedtuple("Directive", "action unit_name")
|
||||||
|
for preset in presets:
|
||||||
|
with preset.open() as f:
|
||||||
|
for line in f:
|
||||||
|
m = directive_re.match(line)
|
||||||
|
if m:
|
||||||
|
directive = Directive(action=m.group('action'),
|
||||||
|
unit_name=m.group('unit_name'))
|
||||||
|
self.directives.append(directive)
|
||||||
|
elif skip_re.match(line):
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
sys.exit("Unparsed preset line in {}".format(preset))
|
||||||
|
|
||||||
|
def _collect_presets(self, scope, root):
|
||||||
|
"""Collect list of preset files"""
|
||||||
|
locations = [SYSCONFDIR / "systemd"]
|
||||||
|
# Handle the usrmerge case by ignoring /lib when it's a symlink
|
||||||
|
if not BASE_LIBDIR.is_symlink():
|
||||||
|
locations.append(BASE_LIBDIR / "systemd")
|
||||||
|
locations.append(LIBDIR / "systemd")
|
||||||
|
|
||||||
|
presets = dict()
|
||||||
|
for location in locations:
|
||||||
|
paths = (root / location / scope).glob("*.preset")
|
||||||
|
for path in paths:
|
||||||
|
# earlier names override later ones
|
||||||
|
if path.name not in presets:
|
||||||
|
presets[path.name] = path
|
||||||
|
|
||||||
|
self._parse_presets([v for k, v in sorted(presets.items())])
|
||||||
|
|
||||||
|
def state(self, unit_name):
|
||||||
|
"""Return state of preset for unit_name
|
||||||
|
|
||||||
|
Args:
|
||||||
|
presets: set of presets
|
||||||
|
unit_name: name of the unit
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
None: no matching preset
|
||||||
|
`enable`: unit_name is enabled
|
||||||
|
`disable`: unit_name is disabled
|
||||||
|
"""
|
||||||
|
for directive in self.directives:
|
||||||
|
if fnmatch.fnmatch(unit_name, directive.unit_name):
|
||||||
|
return directive.action
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def collect_services(root):
|
||||||
|
"""Collect list of service files"""
|
||||||
|
locations = [SYSCONFDIR / "systemd"]
|
||||||
|
# Handle the usrmerge case by ignoring /lib when it's a symlink
|
||||||
|
if not BASE_LIBDIR.is_symlink():
|
||||||
|
locations.append(BASE_LIBDIR / "systemd")
|
||||||
|
locations.append(LIBDIR / "systemd")
|
||||||
|
|
||||||
|
services = dict()
|
||||||
|
for location in locations:
|
||||||
|
paths = (root / location / "system").glob("*")
|
||||||
|
for path in paths:
|
||||||
|
if path.is_dir():
|
||||||
|
continue
|
||||||
|
# implement earlier names override later ones
|
||||||
|
if path.name not in services:
|
||||||
|
services[path.name] = path
|
||||||
|
|
||||||
|
return services
|
||||||
|
|
||||||
|
|
||||||
|
def add_link(path, target):
|
||||||
|
try:
|
||||||
|
path.parent.mkdir(parents=True)
|
||||||
|
except FileExistsError:
|
||||||
|
pass
|
||||||
|
if not path.is_symlink():
|
||||||
|
print("ln -s {} {}".format(target, path))
|
||||||
|
path.symlink_to(target)
|
||||||
|
|
||||||
|
|
||||||
|
def process_deps(root, config, service, location, prop, dirstem):
|
||||||
|
systemdir = SYSCONFDIR / "systemd" / "system"
|
||||||
|
|
||||||
|
target = ROOT / location.relative_to(root)
|
||||||
|
try:
|
||||||
|
for dependent in config.get('Install', prop):
|
||||||
|
wants = root / systemdir / "{}.{}".format(dependent, dirstem) / service
|
||||||
|
add_link(wants, target)
|
||||||
|
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def enable(root, service, location, services):
|
||||||
|
if location.is_symlink():
|
||||||
|
# ignore aliases
|
||||||
|
return
|
||||||
|
|
||||||
|
config = SystemdFile(root, location)
|
||||||
|
template = re.match(r"[^@]+@(?P<instance>[^\.]*)\.", service)
|
||||||
|
if template:
|
||||||
|
instance = template.group('instance')
|
||||||
|
if not instance:
|
||||||
|
try:
|
||||||
|
instance = config.get('Install', 'DefaultInstance')[0]
|
||||||
|
service = service.replace("@.", "@{}.".format(instance))
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
if instance is None:
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
instance = None
|
||||||
|
|
||||||
|
process_deps(root, config, service, location, 'WantedBy', 'wants')
|
||||||
|
process_deps(root, config, service, location, 'RequiredBy', 'requires')
|
||||||
|
|
||||||
|
try:
|
||||||
|
for also in config.get('Install', 'Also'):
|
||||||
|
enable(root, also, services[also], services)
|
||||||
|
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
systemdir = root / SYSCONFDIR / "systemd" / "system"
|
||||||
|
target = ROOT / location.relative_to(root)
|
||||||
|
try:
|
||||||
|
for dest in config.get('Install', 'Alias'):
|
||||||
|
alias = systemdir / dest
|
||||||
|
add_link(alias, target)
|
||||||
|
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def preset_all(root):
|
||||||
|
presets = Presets('system-preset', root)
|
||||||
|
services = collect_services(root)
|
||||||
|
|
||||||
|
for service, location in services.items():
|
||||||
|
state = presets.state(service)
|
||||||
|
|
||||||
|
if state == "enable" or state is None:
|
||||||
|
enable(root, service, location, services)
|
||||||
|
|
||||||
|
|
||||||
|
def mask(root, *services):
|
||||||
|
systemdir = root / SYSCONFDIR / "systemd" / "system"
|
||||||
|
for service in services:
|
||||||
|
add_link(systemdir / service, "/dev/null")
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
if sys.version_info < (3, 4, 0):
|
||||||
|
sys.exit("Python 3.4 or greater is required")
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument('command', nargs=1, choices=['mask', 'preset-all'])
|
||||||
|
parser.add_argument('service', nargs=argparse.REMAINDER)
|
||||||
|
parser.add_argument('--root')
|
||||||
|
parser.add_argument('--preset-mode',
|
||||||
|
choices=['full', 'enable-only', 'disable-only'],
|
||||||
|
default='full')
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
root = Path(args.root) if args.root else ROOT
|
||||||
|
command = args.command[0]
|
||||||
|
if command == "mask":
|
||||||
|
mask(root, *args.service)
|
||||||
|
elif command == "preset-all":
|
||||||
|
if len(args.service) != 0:
|
||||||
|
sys.exit("Too many arguments.")
|
||||||
|
if args.preset_mode != "enable-only":
|
||||||
|
sys.exit("Only enable-only is supported as preset-mode.")
|
||||||
|
preset_all(root)
|
||||||
|
else:
|
||||||
|
raise RuntimeError()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
|
|||||||
Reference in New Issue
Block a user