Skip to content

Commit 328b7f8

Browse files
committed
Include git in dev ISO
Add git to the package list and pre-trust the 9p-mounted source in /etc/gitconfig so `git status` / `log` / `diff` work on it out of the box. The 9p share comes in with host UIDs that do not match the guest, which would otherwise trip git's safe.directory dubious-ownership check.
1 parent 3829bbe commit 328b7f8

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

scripts/dev_vm.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ BUILD_DIR=/tmp/archlive-dev
130130
131131
# Runtime deps - python plus the list derived from pyproject.toml on the host.
132132
# Source comes via 9p, no wheel build needed.
133-
packages=(python)
133+
packages=(python git)
134134
while IFS= read -r p; do
135135
[ -n "$p" ] && packages+=("$p")
136136
done <<< "$RUNTIME_DEPS"
@@ -147,6 +147,14 @@ for p in "${packages[@]}"; do
147147
echo "$p" >> "$BUILD_DIR/packages.x86_64"
148148
done
149149
150+
# Trust the 9p-mounted source for git: host UIDs differ from the guest's,
151+
# which would otherwise trip git's safe.directory dubious-ownership check.
152+
mkdir -p "$BUILD_DIR/airootfs/etc"
153+
cat > "$BUILD_DIR/airootfs/etc/gitconfig" <<'GIT'
154+
[safe]
155+
directory = /root/archinstall-dev
156+
GIT
157+
150158
# Auto-mount project, alias archinstall, print info on login
151159
mkdir -p "$BUILD_DIR/airootfs/root"
152160
cat > "$BUILD_DIR/airootfs/root/.zprofile" <<'ZP'

0 commit comments

Comments
 (0)