Skip to content

Commit

Permalink
Accommodate non-FHS build environments
Browse files Browse the repository at this point in the history
e.g. NixOS
  • Loading branch information
AndrewKvalheim committed Oct 2, 2024
1 parent f56d832 commit 4c39534
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -euo pipefail

Expand Down Expand Up @@ -41,7 +41,7 @@ tar --numeric-owner --preserve-permissions --same-owner --acls --selinux --xattr
systemctl --root=$mnt disable tpm-udev.path

# Slice rootfs config out of fstab, since LABEL=cloudimg-rootfs doesn't exist in the container environment and systemd-remount-fs.service complains about not being able to find it
chroot $mnt sed -i '/LABEL=cloudimg-rootfs/d' /etc/fstab
chroot $mnt /usr/bin/sed -i '/LABEL=cloudimg-rootfs/d' /etc/fstab

# Networking setup is expected to not actually cross a network boundary (i.e. only talk to the container host), so decrease the timeout because all operations here should be fast
mkdir $mnt/etc/systemd/system/systemd-networkd-wait-online.service.d/
Expand Down

0 comments on commit 4c39534

Please sign in to comment.