projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix LC_ALL=C sfdisk thing that I missed
[matthijs/upstream/backupninja.git]
/
handlers
/
mysql
diff --git
a/handlers/mysql
b/handlers/mysql
index b3d0a73b08b709325372211dd8731ee0e2f2ff0c..de4e4c3d2f920d8117c2e960e9c1f5e1619ccf22 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-90,10
+90,10
@@
if [ "$dbusername" != "" -a "$dbpassword" != "" ]
then
if [ $usevserver = yes ]
then
then
if [ $usevserver = yes ]
then
- vhome=`$VSERVER $vsname exec getent passwd "root" |
awk
-F: '{print $6}'`
+ vhome=`$VSERVER $vsname exec getent passwd "root" |
@AWK@
-F: '{print $6}'`
home="$vroot$vhome"
else
home="$vroot$vhome"
else
- home=`getent passwd "root" |
awk
-F: '{print $6}'`
+ home=`getent passwd "root" |
@AWK@
-F: '{print $6}'`
fi
[ -d $home ] || fatal "Can't find root's home directory ($home)."
fi
[ -d $home ] || fatal "Can't find root's home directory ($home)."
@@
-144,14
+144,14
@@
else
userset=true;
if [ $usevserver = yes ]
then
userset=true;
if [ $usevserver = yes ]
then
- vuserhome=`$VSERVER $vsname exec getent passwd "$user" |
awk
-F: '{print $6}'`
+ vuserhome=`$VSERVER $vsname exec getent passwd "$user" |
@AWK@
-F: '{print $6}'`
if [ $? -eq 2 ]
then
fatal "User $user not found in /etc/passwd"
fi
userhome="$vroot$vuserhome"
else
if [ $? -eq 2 ]
then
fatal "User $user not found in /etc/passwd"
fi
userhome="$vroot$vuserhome"
else
- userhome=`getent passwd "$user" |
awk
-F: '{print $6}'`
+ userhome=`getent passwd "$user" |
@AWK@
-F: '{print $6}'`
if [ $? -eq 2 ]
then
fatal "User $user not found in /etc/passwd"
if [ $? -eq 2 ]
then
fatal "User $user not found in /etc/passwd"