From 8fd4886e100b7243b5f1aa29d93e55907382605b Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Mon, 11 Nov 2024 00:02:33 -0800 Subject: [PATCH 1/3] Minor spelling and formatting tweaks. (#807) --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 73a526b..605f986 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ can do so with: git clone https://github.com/RPI-Distro/pi-gen.git ``` -`--depth 1` can be added afer `git clone` to create a shallow clone, only containing +`--depth 1` can be added after `git clone` to create a shallow clone, only containing the latest revision of the repository. Do not do this on your development machine. Also, be careful to clone the repository to a base path **NOT** containing spaces. @@ -230,12 +230,12 @@ This is parsed after `config` so can be used to override values set there. The following process is followed to build images: - * Interate through all of the stage directories in alphanumeric order + * Iterate through all of the stage directories in alphanumeric order * Bypass a stage directory if it contains a file called "SKIP" - * Run the script ```prerun.sh``` which is generally just used to copy the build + * Run the script `prerun.sh` which is generally just used to copy the build directory between stages. * In each stage directory iterate through each subdirectory and then run each of the @@ -256,7 +256,7 @@ The following process is followed to build images: separated, per line. - **00-packages-nr** - As 00-packages, except these will be installed using - the ```--no-install-recommends -y``` parameters to apt-get. + the `--no-install-recommends -y` parameters to apt-get. - **00-patches** - A directory containing patch files to be applied, using quilt. If a file named 'EDIT' is present in the directory, the build process will @@ -399,8 +399,8 @@ follows: * Run build.sh to build all stages * Add SKIP files to the earlier successfully built stages * Modify the last stage - * Rebuild just the last stage using ```sudo CLEAN=1 ./build.sh``` (or, for docker builds - ```PRESERVE_CONTAINER=1 CONTINUE=1 CLEAN=1 ./build-docker.sh```) + * Rebuild just the last stage using `sudo CLEAN=1 ./build.sh` (or, for docker builds + `PRESERVE_CONTAINER=1 CONTINUE=1 CLEAN=1 ./build-docker.sh`) * Once you're happy with the image you can remove the SKIP_IMAGES files and export your image to test From 449d43e182e432ea0fee7e446f817d153c603087 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 11 Nov 2024 10:59:20 +0000 Subject: [PATCH 2/3] Exclude ifupdown as it slows down boot --- scripts/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index 702576f..932a2ee 100644 --- a/scripts/common +++ b/scripts/common @@ -12,7 +12,7 @@ bootstrap(){ BOOTSTRAP_ARGS+=(--arch armhf) BOOTSTRAP_ARGS+=(--components "main,contrib,non-free") BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg") - BOOTSTRAP_ARGS+=(--exclude=info) + BOOTSTRAP_ARGS+=(--exclude=info,ifupdown) BOOTSTRAP_ARGS+=(--include=ca-certificates) BOOTSTRAP_ARGS+=("$@") printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}" From c8d0e0b0bb14e04490cf7c6976d6045a48fb5f23 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 11 Nov 2024 13:21:13 +0000 Subject: [PATCH 3/3] Remove rc.local raspberrypi-sys-mods adds /etc/issue.d/IP.issue instead --- stage1/01-sys-tweaks/00-run.sh | 2 -- stage1/01-sys-tweaks/files/noclear.conf | 2 -- stage2/01-sys-tweaks/01-run.sh | 2 -- stage2/01-sys-tweaks/files/rc.local | 20 -------------------- 4 files changed, 26 deletions(-) delete mode 100644 stage1/01-sys-tweaks/files/noclear.conf delete mode 100755 stage2/01-sys-tweaks/files/rc.local diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index 0f761bd..e024701 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -1,7 +1,5 @@ #!/bin/bash -e -install -d "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d" -install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf" install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab" on_chroot << EOF diff --git a/stage1/01-sys-tweaks/files/noclear.conf b/stage1/01-sys-tweaks/files/noclear.conf deleted file mode 100644 index 52671c7..0000000 --- a/stage1/01-sys-tweaks/files/noclear.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -TTYVTDisallocate=no diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 897463e..be49d32 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -6,8 +6,6 @@ install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/" install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/" -install -m 755 files/rc.local "${ROOTFS_DIR}/etc/" - if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys diff --git a/stage2/01-sys-tweaks/files/rc.local b/stage2/01-sys-tweaks/files/rc.local deleted file mode 100755 index 7d39ed7..0000000 --- a/stage2/01-sys-tweaks/files/rc.local +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -# Print the IP address -_IP=$(hostname -I) || true -if [ "$_IP" ]; then - printf "My IP address is %s\n" "$_IP" -fi - -exit 0