Skip to content
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

Fix arch rootfs #176

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix arch rootfs #176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e838b02
Remove CheckSpace
Radiicall Sep 30, 2024
730ea34
Make resolv file in run dir
Radiicall Sep 30, 2024
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
7 changes: 5 additions & 2 deletions fs/arch/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ if [ ! -f "$CADMIUMROOT/tmp/arch-$ARCH_ALARM.tar.gz" ]; then
fi
tar xfp $CADMIUMROOT/tmp/arch-${ARCH_ALARM}.tar.gz -C $DESTDIR

sed -i s/CheckSpace/#CheckSpace/g $DESTDIR/etc/pacman.conf

$chroot $DESTDIR /usr/bin/pacman-key --init
$chroot $DESTDIR /usr/bin/pacman-key --populate archlinuxarm

rm $DESTDIR/etc/resolv.conf # resolv.conf -> /run/systemd/resolve/resolv.conf not working in $chroot
echo "nameserver 1.1.1.1" > $DESTDIR/etc/resolv.conf # TODO: make it configurable or fetch from host?
#rm $DESTDIR/etc/resolv.conf # resolv.conf -> /run/systemd/resolve/resolv.conf not working in $chroot
mkdir -p $DESTDIR/run/systemd/resolve/ # Should be overwritten by run mount when image is booted
echo "nameserver 1.1.1.1" > $DESTDIR/run/systemd/resolve/resolv.conf # TODO: make it configurable or fetch from host?

$chroot $DESTDIR /usr/bin/pacman -Syu --noconfirm networkmanager

Expand Down