Skip to content

Commit 80d0aff

Browse files
committed
non-functional changes, just logging
1 parent 19d0e65 commit 80d0aff

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

lib/functions/rootfs/rootfs-create.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,21 @@ function create_new_rootfs_cache_via_debootstrap() {
109109

110110
debootstrap_arguments+=("${RELEASE}" "${SDCARD}/" "${debootstrap_apt_mirror}") # release, path and mirror; always last, positional arguments.
111111

112-
# Set DEBOOTSTRAP_DIR only for this invocation; if we instead export it, the second stage will fail
113112
run_host_command_logged "${debootstrap_bin}" "${debootstrap_arguments[@]}" || {
114-
exit_with_error "Debootstrap first stage failed" "${debootstrap_bin} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL}"
113+
exit_with_error "mmdebstrap failed" "${debootstrap_bin} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL}"
115114
}
116115

117-
skip_target_check="yes" local_apt_deb_cache_prepare "after debootstrap first stage" # just for size reference in logs; skip the target check: debootstrap uses it for second stage.
116+
skip_target_check="yes" local_apt_deb_cache_prepare "for mmdebstrap" # just for size reference in logs
118117

119118
deploy_qemu_binary_to_chroot "${SDCARD}" "rootfs" # undeployed near the end of this function
120119

121-
[[ ! -f "${SDCARD}/bin/bash" ]] && exit_with_error "Debootstrap first stage did not produce /bin/bash"
120+
[[ ! -f "${SDCARD}/bin/bash" ]] && exit_with_error "mmdebstrap did not produce /bin/bash"
122121

123-
# Done with debootstrap. Clean-up it's litterbox.
124-
display_alert "Cleaning up after debootstrap" "debootstrap cleanup" "info"
122+
# Done with mmdebstrap. Clean-up its litterbox.
123+
display_alert "Cleaning up after mmdebstrap" "mmdebstrap cleanup" "info"
125124
run_host_command_logged rm -rf "${SDCARD}/var/cache/apt" "${SDCARD}/var/lib/apt/lists"
126125

127-
local_apt_deb_cache_prepare "after debootstrap second stage" # just for size reference in logs
126+
local_apt_deb_cache_prepare "after mmdebstrap cleanup" # just for size reference in logs
128127

129128
mount_chroot "${SDCARD}" # we mount the chroot here... it's un-mounted below when all is done, or by cleanup handler '' @TODO
130129

@@ -265,7 +264,7 @@ function create_new_rootfs_cache_via_debootstrap() {
265264
undeploy_qemu_binary_from_chroot "${SDCARD}" "rootfs"
266265

267266
# stage: make rootfs cache archive
268-
display_alert "Ending debootstrap process and preparing cache" "$RELEASE" "info"
267+
display_alert "Ending mmdebstrap process and preparing cache" "$RELEASE" "info"
269268
wait_for_disk_sync "before tar rootfs"
270269

271270
# we're done with using the chroot which we mounted above.

0 commit comments

Comments
 (0)