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.
We do, however, one case where the enable/disable machinery is still required; that is for the read-only-rootfs case where the 'preset-all' command can not be called at runtime but needs to be called when creatng the image. For this case, we implement 'preset-all' here. There was also a previous implement of 'preset'... not sure that this ever worked as the implementation looks bogus and there aren't any users anyway. This patch removes the 'preset' subcommand, as well. Signed-off-by: Jonas Bonn <[email protected]> --- .../systemd/systemd-systemctl/systemctl | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 2bc6489617..ce50352018 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -9,22 +9,6 @@ while [ $# != 0 ]; do opt="$1" case "$opt" in - enable) - shift - - action="$opt" - services="$1" - cmd_args="1" - shift - ;; - disable) - shift - - action="$opt" - services="$1" - cmd_args="1" - shift - ;; mask) shift @@ -33,13 +17,11 @@ while [ $# != 0 ]; do cmd_args="1" shift ;; - preset) + preset-all) shift action="$opt" - services="$1" - cmd_args="1" - shift + cmd_args="0" ;; --root=*) ROOT=${opt##--root=} @@ -57,16 +39,12 @@ while [ $# != 0 ]; do ;; esac done -if [ "$action" = "preset" -a "$service_file" = "" ]; then + +if [ "$action" = "preset-all" ]; 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 - if [ "$presetall" = "1" ]; then - action="preset" - fi if [ "$action" = "mask" ]; then if [ ! -d $ROOT/etc/systemd/system/ ]; then mkdir -p $ROOT/etc/systemd/system/ @@ -105,10 +83,10 @@ for service in $services; do # If any new unit types are added to systemd they should be added # to this regular expression. unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|target\.wants\|path\|timer\|snapshot\)\s*$' - if [ "$action" = "preset" ]; then - action=`egrep -sh $service $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '` + if [ "$action" = "preset-all" ]; then + action=`egrep -sh $service $ROOT/usr/lib/systemd/system-preset/*.preset | cut -f1 -d' '` if [ -z "$action" ]; then - globalpreset=`egrep -sh '\*' $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '` + globalpreset=`egrep -sh '\*' $ROOT/usr/lib/systemd/system-preset/*.preset | cut -f1 -d' '` if [ -n "$globalpreset" ]; then action="$globalpreset" else -- 2.19.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
