apt-setup: yet another adjustment to fix missing updates.
This commit is contained in:
parent
1f503fb465
commit
25926c10cb
3 changed files with 25 additions and 9 deletions
|
|
@ -77,8 +77,6 @@ fi
|
|||
: "${ROOT:=/target}"
|
||||
SD="$ROOT/etc/apt/sources.list.d"
|
||||
SF="$SD/trisquel.sources"
|
||||
LEGACY="$ROOT/etc/apt/sources.list"
|
||||
MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
|
||||
mkdir -p "$SD"
|
||||
|
||||
# Use keyring in /usr/share/keyrings
|
||||
|
|
@ -113,15 +111,12 @@ Components: main
|
|||
Signed-By: ${SIGNED_BY}
|
||||
EOF
|
||||
|
||||
# Set legacy format for apt-setup to apply updates correctly.
|
||||
{
|
||||
echo "deb ${uri} ${codename} main"
|
||||
echo "deb ${uri} ${codename}-updates main"
|
||||
echo "deb ${uri} ${codename}-security main"
|
||||
} >> "$file"
|
||||
|
||||
# Keep the legacy file and the pipeline temp file as a single breadcrumb line
|
||||
printf '%s\n' "$MSG" > "$LEGACY"
|
||||
printf '%s\n' "$MSG" >> "$file"
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
17
helpers/DATA/apt-setup/99deb822-breadcrumb
Executable file
17
helpers/DATA/apt-setup/99deb822-breadcrumb
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
file="$1"
|
||||
ROOT="${ROOT:-/target}"
|
||||
LEGACY="$ROOT/etc/apt/sources.list"
|
||||
SD="$ROOT/etc/apt/sources.list.d"
|
||||
|
||||
# If .sources exist, leave sources.list reduced only as a breadcrumb
|
||||
if ls "$SD"/*.sources >/dev/null 2>&1; then
|
||||
MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
|
||||
printf '%s\n' "$MSG" > "$LEGACY"
|
||||
printf '%s\n' "$MSG" > "$file"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue