Commit 72e0448
committed
isoInstaller: fix interactive (no-kickstart) ISO install
Booting the ISO interactively (no ks= boot param, no -c config, no VMware
guestinfo.kickstart.*) was broken by two coupled regressions:
1) _load_ks_config_platform()/_load_ks_config_vmware() returned None when
no platform kickstart exists; __init__ then crashed at
'if "live" not in install_config' with:
TypeError: argument of type 'NoneType' is not a container or iterable
Fix: return an empty {} config instead of None.
2) The 'live' block unconditionally stamped install_config['live']=True,
making the empty interactive config truthy. installer.configure() only
runs the UI configurator when 'not install_config', so the UI was
skipped and _check_install_config() raised 'No disk configured'.
Fix: only stamp 'live' on a non-empty (kickstart) config; leave the
interactive config empty so the UI runs (live then defaults via
_add_defaults()).
Regression introduced by 9fc8733 on top of 0a72c3a.
Co-Authored-By: Daniel Casota <dcasota@gmail.com>1 parent 9b8e2fe commit 72e0448
1 file changed
Lines changed: 14 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
83 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
84 | 88 | | |
85 | 89 | | |
86 | 90 | | |
| |||
164 | 168 | | |
165 | 169 | | |
166 | 170 | | |
167 | | - | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
168 | 175 | | |
169 | 176 | | |
170 | 177 | | |
| |||
191 | 198 | | |
192 | 199 | | |
193 | 200 | | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
194 | 205 | | |
195 | 206 | | |
196 | 207 | | |
| |||
0 commit comments