From 5a141a40164b0851dcf1f4f8282b795ff9dbea1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= <filip.lewinski@3mdeb.com>
Date: Tue, 7 Jan 2025 15:33:50 +0100
Subject: [PATCH] ubuntu/: disable *-wait-online services
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
---
 ubuntu/autoinstall.yml |   4 +
 ubuntu/user-data       | 162 ++++++++++++++++-------------------------
 2 files changed, 65 insertions(+), 101 deletions(-)

diff --git a/ubuntu/autoinstall.yml b/ubuntu/autoinstall.yml
index 82a0d9d..c4c3649 100644
--- a/ubuntu/autoinstall.yml
+++ b/ubuntu/autoinstall.yml
@@ -56,4 +56,8 @@ autoinstall:
     - mount --bind /dev /target/dev
     - chroot /target update-grub
     - chroot /target gsettings set org.gnome.SessionManager logout-prompt false
+    - chroot /target systemctl disable NetworkManager-wait-online
+    - chroot /target systemctl disable systemd-networkd-wait-online
+    - chroot /target systemctl mask systemd-networkd-wait-online.service
+    - chroot /target systemctl mask NetworkManager-wait-online.service
   shutdown: 'reboot'
diff --git a/ubuntu/user-data b/ubuntu/user-data
index fedf0e5..5a262d1 100644
--- a/ubuntu/user-data
+++ b/ubuntu/user-data
@@ -1,105 +1,65 @@
 #cloud-config
 autoinstall:
   version: 1
-  locale: en_US
-  keyboard:
-      layout: pl
-  network:
-      network:
-          version: 2
-          ethernets:
-              enp46s0: # NS50MU wired
-                 dhcp4: yes
-              enp1s0:  # VM?
-                 dhcp4: yes
-              enp4s0: {}
-  apt:
-    primary:
-        - arches: [amd64, i386]
-          uri: http://pl.archive.ubuntu.com/ubuntu
-    sources:
-      docker:
-        source: deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable
-        key: |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-
-          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
-          YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
-          =0YYh
-          -----END PGP PUBLIC KEY BLOCK-----
-  identity:
-      hostname: DUT
-      username: user
-      password: "$6$exDY1mhS4KUYCE/2$zmn9ToZwTKLhCw.b4/b.ZRTIZM30JZ4QrOQ2aOXJ8yk96xpcCof0kxKwuX1kqLG/ygbJ1f8wxED22bTL4F46P0" # ubuntu - TODO: change
-  ssh:
-      install-server: yes
-      authorized-keys:
-        # mkopec workstation SSH pubkey
-        - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCh7N95Am8JRQXrCvCssg9RGyRYPCKCuZ0j20ABNW+bjaUkpcJMqPyJYYmLD2mSJ8VFuJ6qR6OX2l4sDrNKs1WksZwwTgUjHi3pkeqn2EMFogecIYFfYsRnP//VJqVOArRyMsqk5JpzATaPH7RcdNqKUo1xl/v6ZyQXLlgs+ngCarKA1woc3oJi5JxZrkDcAb+3P0AEqJ5Nq2g13AO3n1v+/ZfpcVtKNMpjlEXJiheJbUQEhHpYDPlgH1wqV7bnZSVM/sjH9gQjhjU2X/jPCUzZZpoeC1HUxt8f46BC6htGQXX/+OdDlZrLG8rl7DfSQeP99Gfglb2+OhmKoEEdFkx5 michal.kopec@3mdeb.com"
-      allow-pw: yes
+  early-commands:
+    # Configure system-wide DNS, use Google DNS as a generic server:
+    - 'sed -i "s/^nameserver [0-9.]\+/nameserver 8.8.8.8/g" /etc/resolv.conf'
   packages:
-      - ubuntu-desktop
-      - vim
-      - tmux
-      - git
-      - build-essential
-      - linux-tools-generic
-      - acpica-tools
-      - docker
-  
\ No newline at end of file
+    - 'vim'
+    - 'openssh-server'
+  locale: 'en_US.UTF-8'
+  refresh-installer:
+    update: true
+  keyboard:
+    layout: 'us'
+  network:
+    version: 2
+    ethernets:
+      enp0s6:
+        dhcp4: true
+  apt:
+    preserve_sources_list: false
+    mirror_selection:
+      primary:
+        - country-mirror
+        - uri: 'http://archive.ubuntu.com/ubuntu'
+    geoip: true
+    fallback: 'abort'
+  identity:
+    realname: 'Ubuntu'
+    username: 'ubuntu'
+    hostname: 'ubuntu'
+    # Password: ubuntu
+    # Generated with "openssl passwd -6"
+    password: '$6$eRzcYyR3Xw2elP6l$l7JXHXxbXRgD8KCx4xFt4q7aJFpsUfjjMHbfYZAlJ56GLSspojJ6ODxlauuauL72jYbwhEhGwUmzgImIVCFle0'
+  ssh:
+    install-server: true
+    allow-pw: true
+  codecs:
+    install: true
+  timezone: 'geoip'
+  updates: 'all'
+  late-commands:
+    # Enable password authentication
+    - chroot /target sed -i 's/^[[:space:]#]*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+    # Enable ssh on boot
+    - chroot /target systemctl enable ssh
+    # Configure GRUB2
+    - chroot /target sed -i 's/GRUB_TIMEOUT=.*/GRUB_TIMEOUT=5/' /etc/default/grub
+    - chroot /target sed -i 's/kernel.printk.*/kernel.printk = 1 4 1 7/' /etc/sysctl.d/10-console-messages.conf
+    - chroot /target sed -i 's/^GRUB_TIMEOUT_STYLE=.*/GRUB_TIMEOUT_STYLE=menu/' /etc/default/grub
+    - chroot /target sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0,115200n8"/' /etc/default/grub
+    - chroot /target sed -i 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX="console=ttyS0,115200n8"/' /etc/default/grub
+    - chroot /target sed -i 's/^#GRUB_TERMINAL=.*/GRUB_TERMINAL="console serial"/' /etc/default/grub
+    - chroot /target echo 'GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"' >> /etc/default/grub
+    - chroot /target echo 'ttyS0' >> /etc/securetty
+    - mount --bind /proc /target/proc
+    - mount --bind /sys /target/sys
+    - mount --bind /dev /target/dev
+    - chroot /target update-grub
+    - chroot /target gsettings set org.gnome.SessionManager logout-prompt false
+    - chroot /target systemctl disable NetworkManager-wait-online
+    - chroot /target systemctl disable systemd-networkd-wait-online
+    - chroot /target systemctl mask systemd-networkd-wait-online.service
+    - chroot /target systemctl mask NetworkManager-wait-online.service
+  shutdown: 'reboot'