Skip to content

lib / rootfs-create: make rm command more robust #9060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leggewie wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

lib / rootfs-create: make rm command more robust #9060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/functions/rootfs/rootfs-create.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function create_new_rootfs_cache_via_debootstrap() {
chroot_sdcard_apt_get_install "${AGGREGATED_PACKAGES_ROOTFS[@]}"

# Systemd resolver is not working yet
run_host_command_logged rm -v "${SDCARD}"/etc/resolv.conf
run_host_command_logged rm -fv "${SDCARD}"/etc/resolv.conf
run_host_command_logged echo "nameserver $NAMESERVER" ">" "${SDCARD}"/etc/resolv.conf

if [[ $BUILD_DESKTOP == "yes" ]]; then
Expand Down Expand Up @@ -333,7 +333,7 @@ function create_new_rootfs_cache_via_debootstrap() {
display_alert "Free disk space on rootfs" "SDCARD: $(echo -e "${free_space}" | awk -v mp="${SDCARD}" '$6==mp {print $5}')" "info"

# this is needed for the build process later since resolvconf generated file in /run is not saved
run_host_command_logged rm -v "${SDCARD}"/etc/resolv.conf
run_host_command_logged rm -fv "${SDCARD}"/etc/resolv.conf
run_host_command_logged echo "nameserver $NAMESERVER" ">" "${SDCARD}"/etc/resolv.conf

# Remove `machine-id` (https://www.freedesktop.org/software/systemd/man/machine-id.html)
Expand All @@ -342,7 +342,7 @@ function create_new_rootfs_cache_via_debootstrap() {
# please reinitialize this to uninitialized. Do note that systemd will start all services then by
# default and that has to be handled by setting system presets.
run_host_command_logged echo -n ">" "${SDCARD}/etc/machine-id"
run_host_command_logged rm -v "${SDCARD}/var/lib/dbus/machine-id"
run_host_command_logged rm -fv "${SDCARD}/var/lib/dbus/machine-id"

# Mask `systemd-firstboot.service` which will prompt locale, timezone and root-password too early.
# `armbian-first-run` will do the same thing later
Expand Down