diff -u openvpn-2.1~rc11/debian/changelog openvpn-2.1~rc11/debian/changelog
--- openvpn-2.1~rc11/debian/changelog
+++ openvpn-2.1~rc11/debian/changelog
@@ -1,3 +1,12 @@
+openvpn (2.1~rc11-1ubuntu2) intrepid; urgency=low
+
+  * debian/openvpn.init.d:
+    - Revert fix from #454371 that was merged at 2.1~rc7-4 to prevent
+      openvpn prompts from blocking the boot (LP: #280428)
+    - Fix VPNs always reported started [ OK ]
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Wed, 15 Oct 2008 17:12:54 +0200
+
 openvpn (2.1~rc11-1ubuntu1) intrepid; urgency=low
 
   * Merge with Debian (LP: #279655), remaining diffs:
diff -u openvpn-2.1~rc11/debian/openvpn.init.d openvpn-2.1~rc11/debian/openvpn.init.d
--- openvpn-2.1~rc11/debian/openvpn.init.d
+++ openvpn-2.1~rc11/debian/openvpn.init.d
@@ -51,23 +51,21 @@
       STATUSARG="--status /var/run/openvpn.$NAME.status $STATUSREFRESH"
     fi
 
-    log_end_msg 0
-    STATUS=0
-
     # Handle backwards compatibility
     if test -z $( grep '^[[:space:]]*script-security[[:space:]]' $CONFIG_DIR/$NAME.conf ) ; then
         script_security="--script-security 2"
     fi
-	
+
+    STATUS=0
     # Check to see if it's already started...
     if test -e /var/run/openvpn.$NAME.pid ; then
       log_failure_msg "Already running (PID file exists)"
-      STATUS=0
     else
       $DAEMON $OPTARGS --writepid /var/run/openvpn.$NAME.pid \
 	      $DAEMONARG $STATUSARG --cd $CONFIG_DIR \
-	      --config $CONFIG_DIR/$NAME.conf $script_security || STATUS=1
+	      --config $CONFIG_DIR/$NAME.conf $script_security < /dev/null || STATUS=1
     fi
+    log_end_msg $STATUS
 }
 stop_vpn () {
   kill `cat $PIDFILE` || true