Merge branch 'master' into arm64

This commit is contained in:
Serge Schneider 2022-11-08 11:09:30 +00:00
commit da6dde2aea
4 changed files with 5 additions and 4 deletions

View File

@ -194,7 +194,7 @@ The following environment variables are supported:
* `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset) * `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset)
If these are set, they are use to configure `wpa_supplicant.conf`, so that the Raspberry Pi can automatically connect to a wireless network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wireless network will be configured. If set, `WPA_PASSWORD` must be between 8 and 63 characters. If these are set, they are use to configure `wpa_supplicant.conf`, so that the Raspberry Pi can automatically connect to a wireless network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wireless network will be configured. If set, `WPA_PASSWORD` must be between 8 and 63 characters. `WPA_COUNTRY` is a 2-letter ISO/IEC 3166 country Code, i.e. `GB`
* `ENABLE_SSH` (Default: `0`) * `ENABLE_SSH` (Default: `0`)

View File

@ -21,7 +21,7 @@ EOF
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")" PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
if [ -n "$PACKAGES" ]; then if [ -n "$PACKAGES" ]; then
on_chroot << EOF on_chroot << EOF
apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES apt-get -o Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
EOF EOF
if [ "${USE_QCOW2}" = "1" ]; then if [ "${USE_QCOW2}" = "1" ]; then
on_chroot << EOF on_chroot << EOF
@ -36,7 +36,7 @@ EOF
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")" PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
if [ -n "$PACKAGES" ]; then if [ -n "$PACKAGES" ]; then
on_chroot << EOF on_chroot << EOF
apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES apt-get -o Acquire::Retries=3 install -y $PACKAGES
EOF EOF
if [ "${USE_QCOW2}" = "1" ]; then if [ "${USE_QCOW2}" = "1" ]; then
on_chroot << EOF on_chroot << EOF

View File

@ -1,5 +1,5 @@
UNRELEASED: UNRELEASED:
* * Install kms++-utils
2022-09-22: 2022-09-22:
* NodeRED removed from Recommended Software and full image - should only be installed via apt * NodeRED removed from Recommended Software and full image - should only be installed via apt
* Improved speed of startup of lxpanel network controller plugins * Improved speed of startup of lxpanel network controller plugins

View File

@ -33,3 +33,4 @@ raspinfo
udisks2 udisks2
unzip zip p7zip-full unzip zip p7zip-full
file file
kms++-utils