Assorted kickstart script fixes. (#16537)
* Run kickstart code for handling existing installs in all cases where it’s needed. Fixes a bug originally introduced by 6bd0c6e3c3. * Bump repoconfig package version in kickstart script. This was missed when we last updated the package versions.
Austin S. Hemmelgarn committed
Dec 14, 2023 at 07:30 UTC
65c3de12690f78f8c28197e09332beea32fbf7dc
1 file changed
+3
-6
packaging/installer/kickstart.sh
+3
-6
@@ -21,8 +21,8 @@ KICKSTART_SOURCE="$(
21
)"
22
DEFAULT_PLUGIN_PACKAGES=""
23
PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
24
-REPOCONFIG_DEB_VERSION="2-1"
25
-REPOCONFIG_RPM_VERSION="2-1"
24
+REPOCONFIG_DEB_VERSION="2-2"
25
+REPOCONFIG_RPM_VERSION="2-2"
26
START_TIME="$(date +%s)"
27
STATIC_INSTALL_ARCHES="x86_64 armv7l aarch64 ppc64le"
28
@@ -125,6 +125,7 @@ main() {
125
;;
126
esac
127
128
+ handle_existing_install
129
set_tmpdir
130
131
if [ -n "${INSTALL_VERSION}" ]; then
@@ -2325,8 +2326,4 @@ confirm_root_support
2326
get_system_info
2327
confirm_install_prefix
2328
2328
-if [ -z "${ACTION}" ]; then
2329
- handle_existing_install
2330
-fi
2331
-
2329
main