diff -u vblade-14/debian/vblade.init vblade-14/debian/vblade.init --- vblade-14/debian/vblade.init +++ vblade-14/debian/vblade.init @@ -24,9 +24,10 @@ ALLOWMACS="" [ -n "$5" ] && ALLOWMACS="-m $5" ID="$1-e$2.$3" + mkdir -p /var/run/$prog PID_FILE=/var/run/$prog/${ID}.pid $prog $ALLOWMACS $2 $3 $1 $4 >> /var/log/$prog.log 2>&1 & - pid=$i + pid=$! echo $pid > $PID_FILE echo -n $"$4 (e$2.$3@$1) [pid $pid]" [ "$RETVAL" = 0 ] && log_end_msg 0 || log_end_msg 1 diff -u vblade-14/debian/changelog vblade-14/debian/changelog --- vblade-14/debian/changelog +++ vblade-14/debian/changelog @@ -1,3 +1,12 @@ +vblade (14-1ubuntu1.1) hardy-proposed; urgency=low + + * debian/vblade.init: init.d script fails to start because + pid file is not created properly. Thanks to J. Bruce Fields (LP: #223387) + * Backported fix from vblade-15 for vblade discovery bug. Thanks to J. Bruce + Fields (LP: #223440) + + -- Chuck Short Tue, 11 Aug 2009 14:53:36 -0400 + vblade (14-1ubuntu1) hardy; urgency=low * Added init script. only in patch2: unchanged: --- vblade-14.orig/aoe.c +++ vblade-14/aoe.c @@ -202,7 +202,7 @@ perror("read network"); exit(1); } - if (n < 60) + if (n < sizeof(Aoehdr)) continue; p = (Aoehdr *) buf; if (ntohs(p->type) != 0x88a2)