Merge branch 'master' into arm64

This commit is contained in:
Serge Schneider 2024-11-01 12:43:15 +00:00
commit e335a4e8b6
2 changed files with 6 additions and 3 deletions

View File

@ -4,8 +4,6 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.info" INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.info"
SBOM_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.sbom" SBOM_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.sbom"
sed -i 's/^update_initramfs=.*/update_initramfs=all/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
on_chroot << EOF on_chroot << EOF
update-initramfs -k all -c update-initramfs -k all -c
if [ -x /etc/init.d/fake-hwclock ]; then if [ -x /etc/init.d/fake-hwclock ]; then
@ -16,6 +14,11 @@ if hash hardlink 2>/dev/null; then
fi fi
EOF EOF
if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then
sed -i 's/^update_initramfs=.*/update_initramfs=yes/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
sed -i 's/^MODULES=.*/MODULES=dep/' "${ROOTFS_DIR}/etc/initramfs-tools/initramfs.conf"
fi
if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then
chmod 700 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" chmod 700 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config"
fi fi

View File

@ -7,7 +7,7 @@ Index: jessie-stage2/rootfs/etc/dphys-swapfile
# set size to absolute value, leaving empty (default) then uses computed value # set size to absolute value, leaving empty (default) then uses computed value
# you most likely don't want this, unless you have an special disk situation # you most likely don't want this, unless you have an special disk situation
-#CONF_SWAPSIZE= -#CONF_SWAPSIZE=
+CONF_SWAPSIZE=200 +CONF_SWAPSIZE=512
# set size to computed value, this times RAM size, dynamically adapts, # set size to computed value, this times RAM size, dynamically adapts,
# guarantees that there is enough swap without wasting disk space on excess # guarantees that there is enough swap without wasting disk space on excess