Skip to content

Commit

Permalink
Merge pull request #743 from yast/fix_ask_selection
Browse files Browse the repository at this point in the history 
Fix ask selection
  • Loading branch information
@jreidinger
jreidinger committed Mar 17, 2021
2 parents f448b4e + e932182 commit 2a3493b
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 71 deletions.
6 changes: 6 additions & 0 deletions package/autoyast2.changes
View file
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 17 11:50:06 UTC 2021 - Josef Reidinger <jreidinger@suse.com>

- Export properly "ask" section "selection" (bsc#1183624)
- 4.3.74

-------------------------------------------------------------------
Mon Mar 15 20:20:41 UTC 2021 - Knut Anderssen <kanderssen@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/autoyast2.spec
View file
Expand Up @@ -22,7 +22,7 @@
%endif

Name: autoyast2
Version: 4.3.73
Version: 4.3.74
Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Expand Down
142 changes: 72 additions & 70 deletions src/include/autoinstall/xml.rb
View file
Expand Up @@ -17,96 +17,98 @@ def profileSetup
Ops.set(
doc,
"listEntries",
"users" => "user",
"archives" => "archive",
"schemes" => "schema",
"fetchmail" => "fetchmail_entry",
"addons" => "addon",
"aliases" => "alias",
"nfs_exports" => "nfs_export",
"allowed" => "allowed_clients",
"allowed_interfaces" => "allowed_interface",
"allowusers" => "allowuser",
"archives" => "archive",
"ask-list" => "ask",
"authorized_keys" => "authorized_key",
"children" => "child",
"chroot-scripts" => "script",
"classes" => "class",
"denyusers" => "denyuser",
"allowusers" => "allowuser",
"modules" => "module_entry",
"trusteddomains" => "trusteddomain",
"ppd_options" => "ppd_option",
"inetd_services" => "inetd_service",
"initrd_modules" => "initrd_module",
"nfs_entries" => "nfs_entry",
"ntp_servers" => "ntp_server",
"netd_conf" => "conf",
"raid" => "device",
"hosts" => "hosts_entry",
"names" => "name",
"device_map" => "device_map_entry",
"device_map_entry" => "device",
"sections" => "section",
"section" => "section_entry",
"device_order" => "device",
# services-manager -> (hash) services -> (list) enable/disable -> service
"disable" => "service",
"dont_merge" => "element",
# services-manager -> (hash) services -> (list) enable/disable -> service
"enable" => "service",
"fetchmail" => "fetchmail_entry",
"files" => "file",
"global" => "global_entry",
"partitions" => "partition",
"partitioning" => "drive",
"selections" => "selection",
"nis_servers" => "nis_server",
"pre-scripts" => "script",
"post-scripts" => "script",
"chroot-scripts" => "script",
"groups" => "group",
"hosts" => "hosts_entry",
"inetd_services" => "inetd_service",
"init-scripts" => "script",
"postpartitioning-scripts" => "script",
"initrd_modules" => "initrd_module",
"interfaces" => "interface",
"keys" => "keyid",
"local_domains" => "domains",
"logical_volumes" => "lv",
"lvm" => "lvm_group",
"maps_to_serve" => "nis_map",
"masquerade_other_domains" => "domain",
"masquerade_users" => "masquerade_user",
"virtual_users" => "virtual_user",
"services" => "service",
# services-manager -> (hash) services -> (list) enable/disable -> service
"enable" => "service",
"disable" => "service",
"modules" => "module_entry",
"modules_conf" => "module_conf",
"interfaces" => "interface",
"routes" => "route",
"printers" => "printer",
"sysconfig" => "sysconfig_entry",
"shares" => "share",
"names" => "name",
"nameservers" => "nameserver",
"net-udev" => "rule",
"netd_conf" => "conf",
"nfs_entries" => "nfs_entry",
"nfs_exports" => "nfs_export",
"nis_other_domains" => "nis_other_domain",
"nis_servers" => "nis_server",
"ntp_servers" => "ntp_server",
"options" => "option",
"addons" => "addon",
"groups" => "group",
"packages" => "package",
"remove-packages" => "package",
"post-patterns" => "pattern",
"param-list" => "param",
"partitioning" => "drive",
"partitions" => "partition",
"pathlist" => "path",
"patterns" => "pattern",
"ports" => "port",
"post-packages" => "package",
"searchlist" => "search",
"nameservers" => "nameserver",
"region" => "region_entry",
"post-patterns" => "pattern",
"post-scripts" => "script",
"postpartitioning-scripts" => "script",
"ppd_options" => "ppd_option",
"pre-scripts" => "script",
"printcap" => "printcap_entry",
"lvm" => "lvm_group",
"logical_volumes" => "lv",
"volume_settings" => "volume_entry",
"volume_entry" => "volume_component",
"volume_component" => "volume_component_settings",
"settings" => "settings_entry",
"allowed_interfaces" => "allowed_interface",
"children" => "child",
"nis_other_domains" => "nis_other_domain",
"files" => "file",
"printers" => "printer",
"products" => "product",
"proposals" => "proposal",
"raid" => "device",
"region" => "region_entry",
"remove-packages" => "package",
"routes" => "route",
"schemes" => "schema",
"searchlist" => "search",
"section" => "section_entry",
"sections" => "section",
"securenets" => "securenet",
"maps_to_serve" => "nis_map",
"selection" => "entry",
"selections" => "selection",
"semi-automatic" => "module",
"services" => "service",
"settings" => "settings_entry",
"shares" => "share",
"slaves" => "slave",
"smtp_auth" => "smtp_auth_entry",
"patterns" => "pattern",
"dont_merge" => "element",
"keys" => "keyid",
"pathlist" => "path",
"proposals" => "proposal",
"net-udev" => "rule",
"ask-list" => "ask",
"device_order" => "device",
"param-list" => "param",
"semi-automatic" => "module",
"ports" => "port",
"sources" => "source",
"zones" => "zone",
"authorized_keys" => "authorized_key",
"products" => "product",
"subvolumes" => "subvolume"
"subvolumes" => "subvolume",
"sysconfig" => "sysconfig_entry",
"trusteddomains" => "trusteddomain",
"users" => "user",
"virtual_users" => "virtual_user",
"volume_component" => "volume_component_settings",
"volume_entry" => "volume_component",
"volume_settings" => "volume_entry",
"zones" => "zone"
)

# media_url needed for ISO files on NFS
Expand Down

0 comments on commit 2a3493b

Please sign in to comment.