From cff271e11374e7f0a137bb48c49981673321f6f1 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Wed, 13 Jan 2021 14:25:29 +0100
Subject: [PATCH] TT#105871 Check for mariadbd process on bullseye
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's no longer running as mysqld but as mariadbd process.

The mysql.service is present (as in: reachable) but not a
separate systemd unit any longer:

| root@spce:~# systemctl status mysql.service | head -1
| ● mariadb.service - MariaDB 10.5.8 database server
| root@spce:~# systemctl show -p Names --value mariadb.service
| mariadb.service mysqld.service mysql.service

Fixes:

| not ok 505 - Process: mysqld: running: doesn't match, expect: [true] found: [false]
| not ok 205 - Service: mysql.service: enabled: doesn't match, expect: [true] found: [false]

Change-Id: I0740461e0dd77a3d5d8c285fd66018192e3b6308
---
 templates/400_process-debian.yaml.tt2      | 5 +++++
 templates/500_init-daemons-dabian.yaml.tt2 | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2
index bf2a5de..156d61b 100644
--- a/templates/400_process-debian.yaml.tt2
+++ b/templates/400_process-debian.yaml.tt2
@@ -11,11 +11,16 @@ process:
   getty:
     running: [% general.init_system == 'systemd' ? 'false' : 'true' %]
 
+{{if eq .Env.DEBIAN_RELEASE "11"}}
+  mariadbd:
+    running: true
+{{else}}
   mysqld:
     running: true
 
   mysqld_safe:
     running: [% general.init_system == 'systemd' ? 'false' : 'true' %]
+{{end}}
 
   redis-server:
     running: true
diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2
index 0ba4a07..83ee93a 100644
--- a/templates/500_init-daemons-dabian.yaml.tt2
+++ b/templates/500_init-daemons-dabian.yaml.tt2
@@ -51,9 +51,11 @@ service:
     enabled: true
     running: true
 
+{{if lt .Env.DEBIAN_RELEASE "11"}}
   mysql.service:
     enabled: true
     running: true
+{{end}}
 
   rsyslog.service:
     enabled: true