iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da84304
)
enable resolved for vps
author
Ian Kelling
<iank@fsf.org>
Tue, 10 Nov 2020 19:57:56 +0000
(14:57 -0500)
committer
Ian Kelling
<iank@fsf.org>
Tue, 10 Nov 2020 19:57:56 +0000
(14:57 -0500)
fai/config/scripts/GRUB_PC/11-iank
patch
|
blob
|
history
diff --git
a/fai/config/scripts/GRUB_PC/11-iank
b/fai/config/scripts/GRUB_PC/11-iank
index ce78c153ac1e4802d25ba2d00d39776c39d34646..1849d60299660a467be6e79cfd3257d6be068638 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-iank
+++ b/
fai/config/scripts/GRUB_PC/11-iank
@@
-144,9
+144,18
@@
sed -i '$a kernel.sysrq=1
EOFOUTER
EOFOUTER
+rm -f $target/etc/resolv.conf
+ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
+# needed for bitfolk image
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+ systemctl enable systemd-resolved
+ systemctl start systemd-resolved
+fi
+
+
# bitfolk installer handles the rest
case $HOSTNAME in
# bitfolk installer handles the rest
case $HOSTNAME in
- bk) exit 0 ;;
+ bk
|je
) exit 0 ;;
esac
esac
@@
-263,14
+272,6
@@
EOF
fi
fi
-rm -f $target/etc/resolv.conf
-ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
-# needed for bitfolk image
-if [[ -e /a/bin/fai/fai-wrapper ]]; then
- systemctl enable systemd-resolved
- systemctl start systemd-resolved
-fi
-
if ifclass LINODE; then
mkdir -p $target/etc/initramfs-tools/conf.d
cat >$target/etc/initramfs-tools/conf.d/mine <<EOF
if ifclass LINODE; then
mkdir -p $target/etc/initramfs-tools/conf.d
cat >$target/etc/initramfs-tools/conf.d/mine <<EOF