diff options
Diffstat (limited to 'bootstrap.d/50-firstboot.sh')
| -rw-r--r-- | bootstrap.d/50-firstboot.sh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/bootstrap.d/50-firstboot.sh b/bootstrap.d/50-firstboot.sh index 2ec9404..7e2e008 100644 --- a/bootstrap.d/50-firstboot.sh +++ b/bootstrap.d/50-firstboot.sh @@ -6,29 +6,34 @@ . ./functions.sh # Prepare rc.firstboot script -cat files/firstboot/10-begin.sh > "$R/etc/rc.firstboot" +cat files/firstboot/10-begin.sh > "${ETCDIR}/rc.firstboot" # Ensure openssh server host keys are regenerated on first boot if [ "$ENABLE_SSHD" = true ] ; then - cat files/firstboot/21-generate-ssh-keys.sh >> "$R/etc/rc.firstboot" + cat files/firstboot/21-generate-ssh-keys.sh >> "${ETCDIR}/rc.firstboot" fi # Prepare filesystem auto expand if [ "$EXPANDROOT" = true ] ; then - cat files/firstboot/22-expandroot.sh >> "$R/etc/rc.firstboot" + if [ "$ENABLE_CRYPTFS" = false ] ; then + cat files/firstboot/22-expandroot.sh >> "${ETCDIR}/rc.firstboot" + else + # Regenerate initramfs to remove encrypted root partition auto expand + cat files/firstboot/23-regenerate-initramfs.sh >> "${ETCDIR}/rc.firstboot" + fi fi # Ensure that dbus machine-id exists -cat files/firstboot/23-generate-machineid.sh >> "$R/etc/rc.firstboot" +cat files/firstboot/24-generate-machineid.sh >> "${ETCDIR}/rc.firstboot" # Create /etc/resolv.conf symlink -cat files/firstboot/24-create-resolv-symlink.sh >> "$R/etc/rc.firstboot" +cat files/firstboot/25-create-resolv-symlink.sh >> "${ETCDIR}/rc.firstboot" # Finalize rc.firstboot script -cat files/firstboot/99-finish.sh >> "$R/etc/rc.firstboot" -chmod +x "$R/etc/rc.firstboot" +cat files/firstboot/99-finish.sh >> "${ETCDIR}/rc.firstboot" +chmod +x "${ETCDIR}/rc.firstboot" # Add rc.firstboot script to rc.local -sed -i '/exit 0/d' "$R/etc/rc.local" -echo /etc/rc.firstboot >> "$R/etc/rc.local" -echo exit 0 >> "$R/etc/rc.local" +sed -i '/exit 0/d' "${ETCDIR}/rc.local" +echo /etc/rc.firstboot >> "${ETCDIR}/rc.local" +echo exit 0 >> "${ETCDIR}/rc.local" |