components/ruby/puppet-modules/puppetlabs-mysql/patches/01-installdb.patch
author Drew Fisher <drew.fisher@oracle.com>
Thu, 01 Oct 2015 15:00:59 -0700
changeset 4911 6590570733a1
child 5860 afd31ba91ee9
permissions -rw-r--r--
PSARC/2015/368 Common Puppet Modules 21691386 Request to integrate common puppet modules into Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4911
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
In-house patch to change the path for Solaris to find install_db.
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
This patch is not suitable for upstream.
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
--- puppetlabs-mysql-3.6.0/manifests/server/installdb.pp.orig	2015-08-04 09:50:53.470952177 -0700
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     5
+++ puppetlabs-mysql-3.6.0/manifests/server/installdb.pp	2015-08-04 09:51:21.619646340 -0700
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     6
@@ -18,7 +18,7 @@ class mysql::server::installdb {
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     7
       command   => "mysql_install_db ${install_db_args}",
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     8
       creates   => "${datadir}/mysql",
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     9
       logoutput => on_failure,
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    10
-      path      => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    11
+      path      => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/mysql/5.5/bin',
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
       require   => Package['mysql-server'],
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
     }
6590570733a1 PSARC/2015/368 Common Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    14