From 349a035ad081dd31615bcd86d83591fe5598195c Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 1 Oct 2022 19:00:20 +0200
Subject: [PATCH] update base debian template

---
 seed/base-debian/dictionaries/11-debian-base.xml    | 5 +++++
 seed/base-debian/manual/image/postinstall/debian.sh | 6 ++++++
 seed/base-debian/templates/sysuser-debian.conf      | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 seed/base-debian/templates/sysuser-debian.conf

diff --git a/seed/base-debian/dictionaries/11-debian-base.xml b/seed/base-debian/dictionaries/11-debian-base.xml
index 03d4922b..af0e43a7 100644
--- a/seed/base-debian/dictionaries/11-debian-base.xml
+++ b/seed/base-debian/dictionaries/11-debian-base.xml
@@ -4,7 +4,12 @@
     <service name="debian" manage="False">
       <file engine="none" source="tmpfile-tmp.conf">/tmpfiles.d/0tmp.conf</file>
       <file engine="none">/etc/default/locale</file>
+      <file engine="none" source="sysuser-debian.conf">/sysusers.d/debian.conf</file>
     </service>
+    <service name='apt-daily' disabled="True"/>
+    <service name='apt-daily-upgrade' disabled="True"/>
+    <service name='avahi-daemon' disabled="True"/>
+    <service name='cron' disabled="True"/>
   </services>
   <variables>
     <variable name="os_name" type="string" description="Nom de l'OS" hidden="True">
diff --git a/seed/base-debian/manual/image/postinstall/debian.sh b/seed/base-debian/manual/image/postinstall/debian.sh
index f93d9709..b681f290 100644
--- a/seed/base-debian/manual/image/postinstall/debian.sh
+++ b/seed/base-debian/manual/image/postinstall/debian.sh
@@ -1,2 +1,8 @@
 rm -f $IMAGE_NAME_RISOTTO_IMAGE_DIR/etc/resolv.conf
 ln -s ../run/systemd/resolve/stub-resolv.conf $IMAGE_NAME_RISOTTO_IMAGE_DIR/etc/resolv.conf
+#mkdir $IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/network-online.target.wants
+#chmod 775 $IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/network-online.target.wants
+#ln -s /usr/lib/systemd/system/systemd-networkd.service "$IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/dbus-org.freedesktop.network1.service"
+#ln -s /usr/lib/systemd/system/systemd-networkd.service "$IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/multi-user.target.wants/systemd-networkd.service"
+#ln -s /usr/lib/systemd/system/systemd-networkd-wait-online.service "$IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service"
+#ln -s /usr/lib/systemd/system/systemd-networkd.socket "$IMAGE_NAME_RISOTTO_IMAGE_DIR/usr/lib/systemd/system/sockets.target.wants/systemd-networkd.socket"
diff --git a/seed/base-debian/templates/sysuser-debian.conf b/seed/base-debian/templates/sysuser-debian.conf
new file mode 100644
index 00000000..6120e338
--- /dev/null
+++ b/seed/base-debian/templates/sysuser-debian.conf
@@ -0,0 +1,3 @@
+g Debian-exim 109
+u Debian-exim 104:109 "Exim" /var/spool/exim4 /usr/sbin/nologin
+g kvm 103