From dc2002242b9bc863ea718cd0de3e6c1cdec84d9f Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 31 Aug 2020 20:46:52 +0300 Subject: [PATCH] live, rescue: fixup 60-apt There are two different versions of the script with the same name for different subprofiles, sharing some of the same bugs over the years, *sigh*. Shoving those into stage2 would yield online repositories enabled there too which *might* be wanted but will likely need installer support (at least some better error handling, the current culprit with unavailable repositories being apt-pkg's size estimation). Fixes: d2f892abda0ddc02df482cef87c398906d7c93ff Fixes: 0f4ee98fa4360dd1caf48f5d38b1e89925a66f1c --- features.in/live/live/image-scripts.d/60-apt | 2 +- features.in/rescue/rescue/image-scripts.d/60-apt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/features.in/live/live/image-scripts.d/60-apt b/features.in/live/live/image-scripts.d/60-apt index d68fbe30..fb243981 100755 --- a/features.in/live/live/image-scripts.d/60-apt +++ b/features.in/live/live/image-scripts.d/60-apt @@ -7,4 +7,4 @@ PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ... sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \ - "/etc/apt/sources.list.d/${MIRROR:-yandex}.list" + "/etc/apt/sources.list.d/${MIRROR:-yandex}.list" ||: diff --git a/features.in/rescue/rescue/image-scripts.d/60-apt b/features.in/rescue/rescue/image-scripts.d/60-apt index 439a137a..eddeee3a 100755 --- a/features.in/rescue/rescue/image-scripts.d/60-apt +++ b/features.in/rescue/rescue/image-scripts.d/60-apt @@ -1,4 +1,5 @@ #!/bin/sh # enable online repository even more unconditionally -sed -i "s,^#\(rpm .* http.*\),\1," "/etc/apt/sources.list.d/yandex.list" || echo "** warning: unable to enable online repos" >&2 +sed -i "s,^#\(rpm .* http.*\),\1," "/etc/apt/sources.list.d/yandex.list" || + echo "** warning: unable to enable online repos" >&2