Merge branch 'master' of github.com:RPi-Distro/pi-gen

homebridge · Nov 30, 2020 · 67d017c · 67d017c
2 parents a7a54e1 + 0f59f00
commit 67d017c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/export-image/01-set-sources/01-run.sh b/export-image/01-set-sources/01-run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
+find "${ROOTFS_DIR}/var/lib/apt/lists/" -type f -delete
 on_chroot << EOF
 apt-get update
 apt-get -y dist-upgrade

diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
@@ -16,7 +16,6 @@ if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then
 	chmod 700 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config"
 fi
 
-rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
 rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
 
 if [ "${USE_QEMU}" != "1" ]; then

diff --git a/stage4/05-print-support/00-packages b/stage4/05-print-support/00-packages
@@ -0,0 +1,2 @@
+cups
+system-config-printer
diff --git a/stage4/05-print-support/01-run.sh b/stage4/05-print-support/01-run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+on_chroot <<EOF
+adduser "$FIRST_USER_NAME" lpadmin
+EOF