diff --git a/debian-live-config/build.sh b/debian-live-config/build.sh index c6d3df3f..299fcda5 100755 --- a/debian-live-config/build.sh +++ b/debian-live-config/build.sh @@ -24,7 +24,6 @@ lb config \ --architectures amd64 \ --linux-flavours amd64 \ --distribution bookworm \ - --debian-installer live \ --debian-installer-gui true \ --archive-areas "main contrib non-free non-free-firmware" \ --updates true \ @@ -38,6 +37,8 @@ lb config \ --color \ --linux-packages "linux-image linux-headers" \ --memtest memtest86+ \ + --iso-volume WROLPi \ + --iso-application WROLPi \ --iso-preparer WROLPi \ --iso-publisher https://wrolpi.org @@ -45,5 +46,5 @@ rsync -a "${SCRIPT_DIR}/config" "${BUILD_DIR}/" lb build 2>&1 | tee "${SCRIPT_DIR}/build.log" -cp "${BUILD_DIR}"/live*iso "${SCRIPT_DIR}/" || (echo "Build failed. No ISOs were found!" && exit 1) +cp "${BUILD_DIR}"/*iso "${SCRIPT_DIR}/" || (echo "Build failed. No ISOs were found!" && exit 1) chmod 644 "${SCRIPT_DIR}"/*iso diff --git a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot index d0c5add1..a7215a2d 100644 --- a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot +++ b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot @@ -32,8 +32,8 @@ python3 -m venv /opt/wrolpi/venv /opt/wrolpi/venv/bin/pip3 install -r /opt/wrolpi/requirements.txt # Configure nginx. -cp /opt/wrolpi/nginx.conf /etc/nginx/nginx.conf -cp /opt/wrolpi/50x.html /var/www/50x.html +cp /opt/wrolpi/etc/raspberrypios/nginx.conf /etc/nginx/nginx.conf +cp /opt/wrolpi/etc/raspberrypios/50x.html /var/www/50x.html # WROLPi needs a few privileged commands. cp /opt/wrolpi/etc/raspberrypios/90-wrolpi /etc/sudoers.d/90-wrolpi