fix conflict

diff --git a/exec/dotsshmount b/exec/dotsshmount
index 9771556..70c4e19 100755 (executable)
--- a/exec/dotsshmount
+++ b/exec/dotsshmount
@@ -1,6 +1,6 @@
 #!/bin/sh
-SRC="/home/$1/.ssh/"
-DEST="/vservers/$1/home/$1/.ssh/"
+SRC="/home/$1/.ssh"
+DEST="/vservers/$1/home/$1/.ssh"
 
 mkdir -p $DEST &> /dev/null
 

diff --git a/vsys-scripts.spec b/vsys-scripts.spec
index 261afc9..5ae886f 100644 (file)
--- a/vsys-scripts.spec
+++ b/vsys-scripts.spec
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 - Added script fd_packetseer, also updated tun/tap script to be able to create tun devices in addition to tap devices
 - and other minor changes.
 
+* Mon Jul 19 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - vsys-scripts-0.95-20
+- fix dotsshmount
+
 * Thu Jul 01 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - vsys-scripts-0.95-19
 - change dotsshmount's mount point