Skip to content

Commit

Permalink
Multiple sources fix: after changing to deb822 we forgot on leftovers
Browse files Browse the repository at this point in the history
- deboostrap still uses old ways and we need to remove this file
- when displaying the content of sources, we need to look correct file
  • Loading branch information
igorpecovnik committed Mar 5, 2025
1 parent a370033 commit 3199178
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/functions/rootfs/create-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ function extract_rootfs_artifact() {
}

# This comment strategically introduced to force a rebuild of all rootfs, as this file's contents are hashed into all rootfs versions.
# Just a number to force rebuild 003
# Just a number to force rebuild 004
3 changes: 3 additions & 0 deletions lib/functions/rootfs/distro-specific.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ function create_sources_list_and_deploy_repo_key() {

declare distro=""

# Drop deboostrap sources leftovers
rm -f "${basedir}/etc/apt/sources.list"

# Add upstream (Debian/Ubuntu) APT repository
case $release in
buster | bullseye | bookworm | trixie)
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/rootfs/rootfs-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function create_new_rootfs_cache_via_debootstrap() {
# @TODO: use asset logging for this; actually log contents of the files too
run_host_command_logged ls -l "${SDCARD}/usr/share/keyrings"
run_host_command_logged ls -l "${SDCARD}/etc/apt/sources.list.d"
run_host_command_logged cat "${SDCARD}/etc/apt/sources.list"
run_host_command_logged cat "${SDCARD}/etc/apt/sources.list.d/${DISTRIBUTION,,}.sources"

# stage: update packages list
display_alert "Updating package list" "$RELEASE" "info"
Expand Down

0 comments on commit 3199178

Please sign in to comment.