Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/omamobile-firstboot/bin/omamobile-firstboot
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ s_services() {
local unit
for unit in NetworkManager.service systemd-networkd.service systemd-resolved.service sshd.service \
sddm.service bluetooth.service systemd-timesyncd.service ufw.service; do
systemctl enable "$unit" || echo " could not enable $unit"
systemctl enable --no-reload "$unit" || echo " could not enable $unit"
done
systemctl mask systemd-networkd-wait-online.service NetworkManager-wait-online.service || true
systemctl mask --no-reload systemd-networkd-wait-online.service NetworkManager-wait-online.service || true
if [[ ! -L $ROOT/etc/resolv.conf ]]; then
ln -sfn /run/systemd/resolve/stub-resolv.conf "$ROOT/etc/resolv.conf"
fi
Expand Down
4 changes: 3 additions & 1 deletion packages/omamobile-firstboot/test/all
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,10 @@ grep -qF "${KEY:12:30}" "$R/var/log/omamobile/firstboot.log" "$t/run.out" && fai
grep -q '^ufw allow in on usb0 to any port 22 proto tcp$' "$CALLS" || fail "ufw allows SSH on usb0"
grep -qx 'ENABLED=yes' "$R/etc/ufw/ufw.conf" || fail "ufw is on from the next boot"
for unit in sshd.service systemd-networkd.service NetworkManager.service sddm.service ufw.service; do
grep -q "^systemctl enable $unit\$" "$CALLS" || fail "enables $unit"
grep -q "^systemctl enable --no-reload $unit\$" "$CALLS" || fail "enables $unit without reloading systemd each time"
done
grep -q '^systemctl mask --no-reload systemd-networkd-wait-online.service NetworkManager-wait-online.service$' "$CALLS" ||
fail "masks wait-online units without reloading systemd"
grep -qx alice-phone "$R/etc/hostname" || fail "the host name"
[[ $(readlink "$R/etc/localtime") == /usr/share/zoneinfo/Europe/Paris ]] || fail "the time zone"
wifi=$(ls "$R"/etc/NetworkManager/system-connections/*.nmconnection)
Expand Down
2 changes: 1 addition & 1 deletion packages/omamobile-firstboot/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.6
0.1.7