master #111

Merged

asmeron merged 6 commits from Igor1/ubl-settings-datetime:master into develop

Igor1 commented

Исправил команды сохранения.

Igor1 added 5 commits

e2456032a7 Исправлен команду удаления

d5dce2fa9e Исправлено поведение утилиты при запуске без root

c24d5eb788 Исправлена локализация кнопки "сохранить"

fd5c25513c Исправлена работа сохранения

f4a6ae70be Исправил команды изменения

asmeron requested changes

source/ubl-settings-datetime.h Outdated

													
					#define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default"

					#define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp"

					#define set_global_NTPSERVERS "ubconfig --target global set network NTPSERVERS=\""

					#define set_system_ZONE "ubconfig --target system --noexecute set clock ZONE="

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_system_ZONE "ubconfig --target system --noexecute set clock ZONE="

					#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc"

					#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime"

					#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=localtime"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc"

					#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime"

					#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=localtime"

					#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=utc"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=localtime"

					#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=utc"

					#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS"

					#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=utc"

					#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS"

					#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default"

					#define set_system_NTPSERVERS_dhcp "ubconfig --target system --noexecute set network NTPSERVERS=dhcp"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS"

					#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default"

					#define set_system_NTPSERVERS_dhcp "ubconfig --target system --noexecute set network NTPSERVERS=dhcp"

					#define set_system_NTPSERVERS "ubconfig --target system --noexecute set network NTPSERVERS=\""

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default"

					#define set_system_NTPSERVERS_dhcp "ubconfig --target system --noexecute set network NTPSERVERS=dhcp"

					#define set_system_NTPSERVERS "ubconfig --target system --noexecute set network NTPSERVERS=\""

					#define remove_system_NTPSERVERS "ubconfig --target system --noexecute remove network NTPSERVERS"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define remove_system_NTPSERVERS "ubconfig --target system --noexecute remove network NTPSERVERS"

					#define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE="

					#define set_all_ZONE "ubconfig --noexecute set clock ZONE="

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE="

					#define set_all_ZONE "ubconfig --noexecute set clock ZONE="

					#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_all_ZONE "ubconfig --noexecute set clock ZONE="

					#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default"

					#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_all_ZONE "ubconfig --noexecute set clock ZONE="

					#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default"

					#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp"

					#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\""

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default"

					#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp"

					#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\""

					#define remove_all_NTPSERVERS "ubconfig --noexecute remove network NTPSERVERS"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp"

					#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\""

					#define remove_all_NTPSERVERS "ubconfig --noexecute remove network NTPSERVERS"

					#define set_all_HWCLOCK_SYNC_localtime "ubconfig --noexecute set clock HWCLOCK_SYNC=localtime"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

source/ubl-settings-datetime.h Outdated

													
					#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\""

					#define remove_all_NTPSERVERS "ubconfig --noexecute remove network NTPSERVERS"

					#define set_all_HWCLOCK_SYNC_localtime "ubconfig --noexecute set clock HWCLOCK_SYNC=localtime"

					#define set_all_HWCLOCK_SYNC_utc "ubconfig --noexecute set clock HWCLOCK_SYNC=utc"

asmeron commented

Owner

Убрать --noexecute !!

Igor1 commented

Poster

Исправил.
3d18f5d3bd

Igor1 added 1 commit

3d18f5d3bd Исправил команды

asmeron merged commit 2783059c25 into develop 3 years ago

asmeron referenced this issue from a commit

Merge pull request 'master' (#111) from Igor1/ubl-settings-datetime:master into develop

Reviewers

asmeron requested changes

The pull request has been merged as 2783059c25.

No Label

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Applications/ubl-settings-datetime#111