Commit 363b3b7b authored by Dan Johansen's avatar Dan Johansen

disable systemd-resolved.service on boot

parent 6bab261b
......@@ -138,7 +138,7 @@ create_install() {
info "Installing packages for $EDITION on $DEVICE..."
# Install device and editions specific packages
$NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release $PKG_DEVICE $PKG_EDITION --noconfirm
$NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release systemd systemd-libs $PKG_DEVICE $PKG_EDITION --noconfirm
if [[ "$DEVICE" = "on2" ]] || [[ "$DEVICE" = "rpi4" ]]; then
if [[ "$EDITION" = "kde-plasma" ]] || [[ "$EDITION" = "cubocore" ]]; then
$NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm matcha-dynamic-sddm --noconfirm
......@@ -200,9 +200,7 @@ create_install() {
echo 'EndSection' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
sed -i s/"us"/"$KEYMAP"/ $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
#$NSPAWN $TMPDIR/root systemctl disable systemd-resolved.service 1> /dev/null 2>&1
rm -f $TMPDIR/root/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
rm -f $TMPDIR/root/etc/systemd/system/dbus-org.freedesktop.resolve1.service
sed -i s/"enable systemd-resolved.service"/"#enable systemd-resolved.service"/ $TMPDIR/root/usr/lib/systemd/system-preset/90-systemd.preset
echo "Correcting permissions from overlay..."
chown -R root:root $TMPDIR/root/etc
......@@ -253,7 +251,7 @@ create_install() {
fi
info "Cleaning install for unwanted files..."
rm $TMPDIR/root/usr/bin/qemu-aarch64-static
rm -rf $TMPDIR/root/usr/bin/qemu-aarch64-static
rm -rf $TMPDIR/root/var/cache/pacman/pkg/*
rm -rf $TMPDIR/root/var/log/*
rm -rf $TMPDIR/root/etc/*.pacnew
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment