services: add defaults for SYSTEMD and SYSTEMD_USER services
This commit is contained in:
@ -4,8 +4,12 @@ use/services: sub/rootfs
|
||||
@$(call xport,DEFAULT_SERVICES_DISABLE)
|
||||
@$(call xport,SERVICES_ENABLE)
|
||||
@$(call xport,SERVICES_DISABLE)
|
||||
@$(call xport,DEFAULT_SYSTEMD_SERVICES_ENABLE)
|
||||
@$(call xport,DEFAULT_SYSTEMD_SERVICES_DISABLE)
|
||||
@$(call xport,SYSTEMD_SERVICES_ENABLE)
|
||||
@$(call xport,SYSTEMD_SERVICES_DISABLE)
|
||||
@$(call xport,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE)
|
||||
@$(call xport,DEFAULT_SYSTEMD_USER_SERVICES_DISABLE)
|
||||
@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)
|
||||
@$(call xport,SYSTEMD_USER_SERVICES_DISABLE)
|
||||
|
||||
|
@ -44,12 +44,17 @@ for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
|
||||
for i in $GLOBAL_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# systemd services
|
||||
# defaults systemd services
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# explicitly specified behaviour systemd services
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_DEFAULT_SYSTEMD_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE"
|
||||
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)"
|
||||
|
||||
@ -88,9 +93,15 @@ for f in systemd-user-enabled systemd-user-disabled; do
|
||||
CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
|
||||
done
|
||||
|
||||
# defaults logind services
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE; do switch $i enabled; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done
|
||||
|
||||
# explicitly specified behaviour logind services
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE; do switch $i enabled; done
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done
|
||||
|
||||
SERVICES="$GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE"
|
||||
SERVICES="$GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE"
|
||||
SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | sort -u)"
|
||||
|
||||
|
@ -33,13 +33,25 @@ for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
|
||||
for i in $GLOBAL_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# systemd services
|
||||
## systemd services
|
||||
CHKCONFIG=
|
||||
|
||||
# defaults
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# explicitly specified behaviour
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# systemd-logind services
|
||||
## systemd-logind services
|
||||
SYSTEMD_USER='--user --global'
|
||||
|
||||
# defaults
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# explicitly specified behaviour
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
|
Reference in New Issue
Block a user