From: stephen mahood <mv@fsf.org>
Date: Mon, 5 Jan 2015 22:25:46 +0000 (-0500)
Subject: Merge branch 'master' of vcs.fsf.org:fai-configs
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=c2995912c9a05a0f58dc09cd5b7e1696ada38784;hp=4ccc37db3028cb17bc22871e4b993cb99d3d762b

Merge branch 'master' of vcs.fsf.org:fai-configs
---

diff --git a/class/50-host-classes b/class/50-host-classes
index 43c7c0b..35ea701 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -6,8 +6,8 @@ nogrub=0
 
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
-    faiserver)
-        echo "FAIBASE DEMO FAISERVER" ;;
+    faiserver*)
+	echo "FAIBASE FAISEVER SYSADMIN VM" ;;
     demohost)
         echo "FAIBASE DHCPC DEMO" ;;
     rms)
@@ -40,6 +40,10 @@ case $HOSTNAME in
         echo "FAIBASE JOB SYSADMIN VM"
         nogrub=1
         ;;
+    mysqlserver*)
+        echo "FAIBASE JOB SYSADMIN MYSQLD"
+        nogrub=1
+        ;;
     *)  
         echo "FAIBASE DHCPC DEMO XORG GNOME";;
 esac
diff --git a/debconf/MYSQLD b/debconf/MYSQLD
new file mode 100644
index 0000000..e5516b8
--- /dev/null
+++ b/debconf/MYSQLD
@@ -0,0 +1,4 @@
+mysql-server        mysql-server/root_password        password liFor2Sh
+mysql-server        mysql-server/root_password_again        password liFor2Sh
+mysql-server        mysql-server/root_password        seen  true
+mysql-server        mysql-server/root_password_again  seen  true