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: d2f892abda
Fixes: 0f4ee98fa4
This commit is contained in:
Michael Shigorin 2020-08-31 20:46:52 +03:00
parent c7a1d3c8c5
commit dc2002242b
2 changed files with 3 additions and 2 deletions

View File

@ -7,4 +7,4 @@ PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync
MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ... MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ...
sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \ sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \
"/etc/apt/sources.list.d/${MIRROR:-yandex}.list" "/etc/apt/sources.list.d/${MIRROR:-yandex}.list" ||:

View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
# enable online repository even more unconditionally # 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