[package] update

master
Dmitry Razumov 3 years ago
parent cba6fe89db
commit 572f73986a

@ -168,10 +168,10 @@ MKSQFS_FASTALG="-b 32K -comp gzip"
#/rc.post.d/02-hwclock #/rc.post.d/02-hwclock
#/rc.halt/20-timesave #/rc.halt/20-timesave
HWCLOCK_SYNC="utc" HWCLOCK_SYNC=utc
#/rc.preinit.d/10-system #/rc.preinit.d/10-system
ZONE="UTC" ZONE=Etc/UTC
#/rc.preinit.d/52-desktop #/rc.preinit.d/52-desktop
#/rc.post.d/02-hwclock #/rc.post.d/02-hwclock

@ -55,11 +55,11 @@ EOF
exec_polkit(){ exec_polkit(){
## Настрока polkit правил ## Настрока polkit правил
rm -f ${ROOTFS}/etc/polkit-1/rules.d/kiosk-* rm -f ${ROOTFS}/etc/polkit-1/rules.d/ublinux-*
if [[ -n ${POLKIT[@]} ]]; then if [[ -n ${POLKIT[@]} ]]; then
for RULES in "${!POLKIT[@]}"; do for RULES in "${!POLKIT[@]}"; do
RULES_GROUP= RULES_GROUP=
RULES_FILE="${ROOTFS}/etc/polkit-1/rules.d/kiosk-$(sed 's/\([A-z0-9]*.[A-z0-9]*.[A-z0-9]*\)\..*/\1/' <<< ${RULES}).rules" RULES_FILE="${ROOTFS}/etc/polkit-1/rules.d/ublinux-$(sed 's/\([A-z0-9]*.[A-z0-9]*.[A-z0-9]*\)\..*/\1/' <<< ${RULES}).rules"
RULES_RESULT=$(cut -d: -f1 <<< ${POLKIT[${RULES}]}) RULES_RESULT=$(cut -d: -f1 <<< ${POLKIT[${RULES}]})
for GROUP in $(grep ":" <<< ${POLKIT[${RULES}]} | cut -d: -f2 | tr ',' '\n'); do for GROUP in $(grep ":" <<< ${POLKIT[${RULES}]} | cut -d: -f2 | tr ',' '\n'); do
RULES_GROUP+="&& subject.isInGroup(\"${GROUP}\") " RULES_GROUP+="&& subject.isInGroup(\"${GROUP}\") "

@ -588,19 +588,20 @@ NSSWITCHWINBIND=yes
#HWCLOCK_SYNC=localtime #HWCLOCK_SYNC=localtime
## Установка часового пояса * =UTC ## Установка часового пояса * =UTC
## ZONE=*UTC|... ## ZONE=...
#ZONE=UTC # Time zone for UTC MSK-3 ## * =Etc/UTC # Time zone for UTC MSK-3
#ZONE=Europe/Kaliningrad # Time zone for UTC+2 MSK-1 ## =Europe/Kaliningrad # Time zone for UTC+2 MSK-1
#ZONE=Europe/Moscow # Time zone for UTC+3 MSK ## =Europe/Moscow # Time zone for UTC+3 MSK
#ZONE=Europe/Samara # Time zone for UTC+4 MSK+1 ## =Europe/Samara # Time zone for UTC+4 MSK+1
#ZONE=Asia/Yekaterinburg # Time zone for UTC+5 MSK+2 ## =Asia/Yekaterinburg # Time zone for UTC+5 MSK+2
#ZONE=Asia/Omsk # Time zone for UTC+6 MSK+3 ## =Asia/Omsk # Time zone for UTC+6 MSK+3
#ZONE=Asia/Krasnoyarsk # Time zone for UTC+7 MSK+4 ## =Asia/Krasnoyarsk # Time zone for UTC+7 MSK+4
#ZONE=Asia/Irkutsk # Time zone for UTC+8 MSK+5 ## =Asia/Irkutsk # Time zone for UTC+8 MSK+5
#ZONE=Asia/Chita # Time zone for UTC+9 MSK+6 ## =Asia/Chita # Time zone for UTC+9 MSK+6
#ZONE=Asia/Yakutsk # Time zone for UTC+10 MSK+7 ## =Asia/Yakutsk # Time zone for UTC+10 MSK+7
#ZONE=Asia/Vladivostok # Time zone for UTC+11 MSK+8 ## =Asia/Vladivostok # Time zone for UTC+11 MSK+8
#ZONE=Asia/Magadan # Time zone for UTC+12 MSK+9 ## =Asia/Magadan # Time zone for UTC+12 MSK+9
#ZONE=Europe/Moscow
################################################################################ ################################################################################
[/etc/ublinux/locale] [/etc/ublinux/locale]

Loading…
Cancel
Save