Merge pull request #6833 from SUSE/wip-13935-infernalis

infernalis: Ceph daemon failed to start, because the service name was already used. Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Feb 8, 2016 · 5dbd998 · 5dbd998
2 parents 2016468 + c968a40
commit 5dbd998
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/init-ceph.in b/src/init-ceph.in
@@ -307,7 +307,8 @@ for name in $what; do
 	    [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
 
 	    if [ -n "$SYSTEMD_RUN" ]; then
-		cmd="$SYSTEMD_RUN -r bash -c '$files $cmd --cluster $cluster --setuser ceph --setgroup ceph -f'"
+                time=`date +%s.%N` 
+		cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $cmd --cluster $cluster --setuser ceph --setgroup ceph -f'"
 	    else
 		cmd="$files $wrap $cmd --cluster $cluster --setuser ceph --setgroup ceph $runmode"
 	    fi