vidal/rpiGenImage
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mise à jour image météo et quelques scripts.

Browse Source
This commit is contained in:
Administrateur Général
2026-02-21 21:01:19 +01:00
parent 5057e21226
commit 2fe1f37596
6 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bootstrap.d/10-bootstrap.sh
View File

@@ -8,10 +8,12 @@
VARIANT=""
COMPONENTS="main"
if [ "$BUILD_KERNEL" != "uselocal" ]; then #ajout 2025
# Use non-free Debian packages if needed
# One use variable which is only needed by wifi firmware blob => reworked to use non free in /etc/apt/sources.list - we could just use ENABLE_WIRELESS here
# One use variable which is only needed by wifi firmware blob
# => reworked to use non free in /etc/apt/sources.list
#- we could just use ENABLE_WIRELESS here
if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_NONFREE" = true ] ; then
COMPONENTS="main,non-free,contrib,non-free-firmware"
fi
@@ -30,19 +32,17 @@ fi
# Base debootstrap (unpack only)
http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
if [ "$BUILD_KERNEL" != "uselocal" ]; then # added to enable reuse the environment
# Copy qemu emulator binary to chroot
install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
# Copy qemu emulator binary to chroot
install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
# Copy debian-archive-keyring.pgp
mkdir -p "${R}/usr/share/keyrings"
install_readonly /usr/share/keyrings/debian-archive-keyring.gpg "${R}/usr/share/keyrings/debian-archive-keyring.gpg"
# Copy debian-archive-keyring.pgp
mkdir -p "${R}/usr/share/keyrings"
install_readonly /usr/share/keyrings/debian-archive-keyring.gpg "${R}/usr/share/keyrings/debian-archive-keyring.gpg"
# Complete the bootstrapping process
chroot_exec /debootstrap/debootstrap --second-stage
# Complete the bootstrapping process
chroot_exec /debootstrap/debootstrap --second-stage
fi

20
bootstrap.d/11-apt.sh
View File

@@ -11,25 +11,25 @@ if [ -z "$APT_PROXY" ] ; then
sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
fi
# Install APT sources.list
install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
# Install APT sources.list.d/debian.sources
install_readonly files/apt/sources.list.d/debian.sources "${ETC_DIR}/apt/sources.list.d/debian.sources"
# Use specified APT server and release
sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list.d/debian.sources"
#Fix for changing path for security updates in oldstable / bullseye
if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "bullseye " ] ; then
sed -i "s:bookworm-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list"
sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list"
fi
# not necessary anymore ?????
#if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "bullseye " ] ; then
#sed -i "s:bookworm-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list"
#sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list"
#fi
if [ "$ENABLE_NONFREE" = "true" ] ; then
sed -i "s,main contrib,main contrib non-free non-free-firmware," "${ETC_DIR}/apt/sources.list"
sed -i "s,main contrib,main contrib non-free non-free-firmware," "${ETC_DIR}/apt/sources.list.d/debian.sources"
fi
if [ "$RELEASE" != "$RELEASE" ] ; then
# Change release in sources list
sed -i "s/ ${HOSTRELEASE}/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
sed -i "s/ ${HOSTRELEASE}/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list.d/debian.sources"
fi
# Upgrade package index and update all installed packages and changed dependencies