diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index cf7d9d4..c8e6d68 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -150,8 +150,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[@users]='freerdp-server.service'" -#define disable_rdp_command "ubconfig --target system remove [desktop] AUTOEXEC[@users]" +#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 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" @@ -267,6 +267,7 @@ layout && /description:/ {\ #define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" #define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ", parameters, "; nice ubinstall autoinstall --noautoconfig --noinstall_extra", NULL) +#define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall --config='",path,"' --noautoconfig --noinstall_extra", NULL) #define set_user_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, ";nice ubinstall autoconfig install_extra", NULL) #define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, NULL) @@ -459,7 +460,6 @@ typedef struct GList *slides; GList *chosen_slide; - gboolean force_scenario; char *os_name; config_str partitions; @@ -475,6 +475,8 @@ typedef struct config_str argv; int argc; + + int autoinstall; // if active, installation starts immidiately after app start } config; extern config main_config;