Skip to content

M
mkimage-profiles
Commit 9a7d2655 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

services: do not enable/disable serivices with prefix "livecd-" in installer

parent debf6e4e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
features.in/services/install2/image-scripts.d/10-services
View file @ 9a7d2655
...@@ -57,7 +57,7 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE" ...@@ -57,7 +57,7 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_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_DEFAULT_SYSTEMD_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE" SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE"
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)" SERVICES="$(echo $SERVICES | sed '/^livecd-/d' | tr " " "\n" | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")" onoff="$(shell_config_get "$STATUS" "$i")"
...@@ -98,7 +98,7 @@ for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done ...@@ -98,7 +98,7 @@ for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done
for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done
SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK" SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK"
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)" SERVICES="$(echo $SERVICES | sed '/^livecd-/d' | tr " " "\n" | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
maskunmask="$(shell_config_get "$STATUS" "$i")" maskunmask="$(shell_config_get "$STATUS" "$i")"
...@@ -127,7 +127,7 @@ for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done ...@@ -127,7 +127,7 @@ 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_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE" SERVICES="$SERVICES $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE"
SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | sort -u)" SERVICES="$(echo "$SERVICES" | sed '/^livecd-/d' | tr ' ' '\n' | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")" onoff="$(shell_config_get "$STATUS" "$i")"
......
features.in/services/live/image-scripts.d/10-services-install
View file @ 9a7d2655
...@@ -61,7 +61,7 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE" ...@@ -61,7 +61,7 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_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_DEFAULT_SYSTEMD_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE" SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE"
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)" SERVICES="$(echo $SERVICES | sed '/^livecd-/d' | tr " " "\n" | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")" onoff="$(shell_config_get "$STATUS" "$i")"
...@@ -102,7 +102,7 @@ for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done ...@@ -102,7 +102,7 @@ for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done
for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done
SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK" SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK"
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)" SERVICES="$(echo $SERVICES | sed '/^livecd-/d' | tr " " "\n" | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
maskunmask="$(shell_config_get "$STATUS" "$i")" maskunmask="$(shell_config_get "$STATUS" "$i")"
...@@ -131,7 +131,7 @@ for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done ...@@ -131,7 +131,7 @@ 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_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE" SERVICES="$SERVICES $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE"
SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | sort -u)" SERVICES="$(echo "$SERVICES" | sed '/^livecd-/d' | tr ' ' '\n' | sort -u)"
for i in $SERVICES; do for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")" onoff="$(shell_config_get "$STATUS" "$i")"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment