From 44da4d319d543d4dfe8657416dbe512333cb291b Mon Sep 17 00:00:00 2001
From: Nathan Gardiner <ngardiner@gmail.com>
Date: Sun, 11 Jun 2023 14:08:14 +1000
Subject: [PATCH] Update mariadb template

---
 mariadb/.gitignore |  2 +-
 mariadb/Makefile   |  2 --
 mariadb/README.md  |  4 ++++
 mariadb/dab.conf   | 12 ++++++------
 mariadb/runonce.sh |  2 ++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mariadb/.gitignore b/mariadb/.gitignore
index 07b10fb..779f8c1 100644
--- a/mariadb/.gitignore
+++ b/mariadb/.gitignore
@@ -2,4 +2,4 @@ config
 info
 logfile
 rootfs
-*.tar.gz
+ubuntu-22.04-mariadb_22.04-1_amd64.tar.gz
diff --git a/mariadb/Makefile b/mariadb/Makefile
index 4ccdada..13e1654 100644
--- a/mariadb/Makefile
+++ b/mariadb/Makefile
@@ -11,8 +11,6 @@ bootstrap:
 
 	# Create common database schemas
 	install -m 0600 zm_create.sql ${BASEDIR}/tmp/zm_create.sql
-	dab exec mysql < /tmp/zm_create.sql
-	dab exec rm /tmp/*.sql
 
 	# Enable run-once script
 	install -m 0700 runonce.sh ${BASEDIR}/etc/init.d/firstboot
diff --git a/mariadb/README.md b/mariadb/README.md
index 6345d09..7556707 100644
--- a/mariadb/README.md
+++ b/mariadb/README.md
@@ -17,3 +17,7 @@ To create the template archive:
 To clean and return the template directory to original state
 
 ```make clean```
+
+detecting final appliance size: 1242 MB
+detecting final commpressed appliance size: 227 MB
+
diff --git a/mariadb/dab.conf b/mariadb/dab.conf
index eebf459..96788f5 100644
--- a/mariadb/dab.conf
+++ b/mariadb/dab.conf
@@ -1,13 +1,13 @@
-Suite: xenial
+Suite: jammy
 CacheDir: ../cache
-Source: http://archive.ubuntu.com/ubuntu SUITE main restricted universe multiverse 
-Source: http://archive.ubuntu.com/ubuntu SUITE-updates main restricted universe multiverse  
-Source: http://archive.ubuntu.com/ubuntu SUITE-security main restricted universe multiverse 
+Source: http://archive.ubuntu.com/ubuntu SUITE main restricted universe multiverse
+Source: http://archive.ubuntu.com/ubuntu SUITE-updates main restricted universe multiverse
+Source: http://archive.ubuntu.com/ubuntu SUITE-security main restricted universe multiverse
 Architecture: amd64
 Name: mariadb
-Version: 16.04-1
+Version: 22.04-1
 Section: system
 Maintainer: Nathan Gardiner <ngardiner@gmail.com>
 Infopage: https://www.mysql.com
 Description: MariaDB
- MariaDB is
+ MariaDB is a relational database platform
diff --git a/mariadb/runonce.sh b/mariadb/runonce.sh
index 290c2e0..b28a96d 100755
--- a/mariadb/runonce.sh
+++ b/mariadb/runonce.sh
@@ -16,6 +16,8 @@ case "$1" in
   start)
 
     # Put first boot routines here
+    mysql -e 'source /tmp/zm_create.sql'
+    rm /tmp/*.sql
 
     rm $0
   ;;