[blfs-book] r11120 - in trunk: BOOK BOOK/server/databases bootscripts/blfs/init.d bootscripts/systemd/tmpfiles

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Sun Mar 24 04:02:49 PDT 2013


Author: krejzi
Date: Sun Mar 24 04:02:49 2013
New Revision: 11120

Log:
Fix mysql with systemd, part 2.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/server/databases/mysql.xml
   trunk/bootscripts/blfs/init.d/mysql
   trunk/bootscripts/systemd/tmpfiles/mysqld.conf

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sun Mar 24 03:56:56 2013	(r11119)
+++ trunk/BOOK/general.ent	Sun Mar 24 04:02:49 2013	(r11120)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 23rd, &year;">
+<!ENTITY releasedate  "March 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
@@ -67,7 +67,7 @@
 <!ENTITY lfs-vim-version              "7.3">
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20130323">
+<!ENTITY blfs-bootscripts-version     "20130324">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
 <!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">

Modified: trunk/BOOK/server/databases/mysql.xml
==============================================================================
--- trunk/BOOK/server/databases/mysql.xml	Sun Mar 24 03:56:56 2013	(r11119)
+++ trunk/BOOK/server/databases/mysql.xml	Sun Mar 24 04:02:49 2013	(r11120)
@@ -181,7 +181,7 @@
       -DINSTALL_SQLBENCHDIR=share/mysql/bench       \
       -DINSTALL_SUPPORTFILESDIR=share/mysql/support \
       -DMYSQL_DATADIR=/srv/mysql                    \
-      -DMYSQL_UNIX_ADDR=/var/run/mysql/mysql.sock   \
+      -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysql.sock  \
       -DSYSCONFDIR=/etc/mysql                       \
       -DWITH_PARTITION_STORAGE_ENGINE=OFF           \
       -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF          \
@@ -310,7 +310,7 @@
         class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /var/run/mysql &&
+<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /var/run/mysqld &&
 mysqld_safe --user=mysql 2>&1 >/dev/null &</userinput></screen>
 
       <para>

Modified: trunk/bootscripts/blfs/init.d/mysql
==============================================================================
--- trunk/bootscripts/blfs/init.d/mysql	Sun Mar 24 03:56:56 2013	(r11119)
+++ trunk/bootscripts/blfs/init.d/mysql	Sun Mar 24 04:02:49 2013	(r11120)
@@ -35,8 +35,8 @@
       log_info_msg "Starting MySQL daemon..."
 
       # Make sure the mysql user can create a socket
-      mkdir -p /run/mysql
-      chown mysql.mysql /run/mysql
+      mkdir -p /run/mysqld
+      chown mysql.mysql /run/mysqld
 
       if [ -f "$PIDFILE" ]; then
          if /bin/ps --pid `cat $PIDFILE` | grep mysqld >/dev/null; then

Modified: trunk/bootscripts/systemd/tmpfiles/mysqld.conf
==============================================================================
--- trunk/bootscripts/systemd/tmpfiles/mysqld.conf	Sun Mar 24 03:56:56 2013	(r11119)
+++ trunk/bootscripts/systemd/tmpfiles/mysqld.conf	Sun Mar 24 04:02:49 2013	(r11120)
@@ -1 +1 @@
-d /run/mysql 0755 mysql mysql -
+d /run/mysqld 0755 mysql mysql -



More information about the blfs-book mailing list