From a21d9eef1bbefcdfcb7a72862a245647d9cd6d69 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 17 Mar 2026 14:29:37 +0600 Subject: [PATCH] fixed building; fixed commands --- source/ubinstall-gtk-bootloader.c | 3 --- source/ubinstall-gtk.h | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index f461871..d8cbaa3 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -10,7 +10,6 @@ int yon_bootloader_save(main_window *widgets){ { int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); - char *admins = config(GRUB_SUPERUSERS_parameter); for (int i=0;iBootloadUsersList); - int admin_size=0; - config_str admin_list = NULL; for_iter(model,&iter){ int is_admin; char *username, *password; diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 3347ac2..172bdf3 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -152,8 +152,8 @@ layout && /description:/ {\ #define enable_vnc_command "ubconfig --target system set [desktop] X11VNC[password]=ublinux" #define disable_vnc_command "ubconfig --target system remove [desktop] X11VNC[password]" -#define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC++=freerdp-server.serv" -#define disable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC--=freerdp-server.serv" +#define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC++=freerdp-server.service" +#define disable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC--=freerdp-server.service" #define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"", layout, "\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u", NULL) // #define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7" @@ -242,17 +242,18 @@ layout && /description:/ {\ #define GRUB_DEFAULT_parameter "AUTOINSTALL[ubconfig set [boot] GRUB_DEFAULT]" #define GRUB_DEFAULT_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_DEFAULT']" #define GRUB_PASSWORD_parameter_search "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[" -#define GRUB_PASSWORD_parameter_all "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[*]]" +#define GRUB_PASSWORD_parameter_all "AUTOINSTALL[\"ubconfig set [boot] GRUB_PASSWORD[*]\"]" #define GRUB_PASSWORD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[", target, "]]", NULL) #define GRUB_PASSWORD_parameter_command_all "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[*]']" #define GRUB_PASSWORD_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[", target, "]']", NULL) #define AUTOLOGINUSER_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOLOGINUSER]" #define AUTOLOGINUSER_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] AUTOLOGINUSER']" +#define NETWORK_parameter_all "AUTOINSTALL[\"ubconfig set [network] NETWORK[*]\"]" #define NETWORK_parameter_search "AUTOINSTALL[ubconfig set [network] NETWORK[" #define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@connmod]]", NULL) #define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@devdown]]", NULL) -#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@connmod]']", NULL) #define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@devdown]']", NULL) +#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@connmod]']", NULL) #define NETWORK(target) yon_char_unite("NETWORK[", target, "@connmod]", NULL) #define installer_locale_parameter "AUTOINSTALL[installer_locale]" #define installer_locale_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[installer_locale]"