[Pkg-uml-commit] r296 - trunk/src/uml-utilities/debian

[malattia at alioth.debian.org]

Author: malattia
Date: 2007-08-19 10:58:14 +0000 (Sun, 19 Aug 2007)
New Revision: 296

Modified:
   trunk/src/uml-utilities/debian/changelog
   trunk/src/uml-utilities/debian/uml-utilities.init
Log:
* reformatted changelog deleting the never-uploaded 20060622
* fixed lsb init support
* create /var/run/uml-utilites if it doesn't exist


Modified: trunk/src/uml-utilities/debian/changelog
===================================================================
--- trunk/src/uml-utilities/debian/changelog	2007-08-19 06:52:04 UTC (rev 295)
+++ trunk/src/uml-utilities/debian/changelog	2007-08-19 10:58:14 UTC (rev 296)
@@ -1,28 +1,24 @@
 uml-utilities (20070815-1) unstable; urgency=low
 
-  * New upstream version (Closes: #438457)
-  * Remove obsolete MAKEDEV invocation and udev/makedev dependencies
-    (Closes: #434161)
-
- -- Mattia Dongili <malattia at debian.org>  Sun, 19 Aug 2007 15:39:38 +0900
-
-uml-utilities (20060622-1) unstable; urgency=low
-  
+  * New upstream version (Closes: #438457) (Closes: #393263)
   [Stefano Melchior]
-  * new upstream release (Closes: #393263)
-  * added the humfsify man page
-  * added the uml_mount man page
-  * updated policy version in debian/control
-  * added correction in the tunctl man page (Closes: #395020)
-  * added LSB support with patch from David Härdeman (Closes: #385906)
+    * added the humfsify man page
+    * added the uml_mount man page
+    * updated policy version in debian/control
+    * added correction in the tunctl man page (Closes: #395020)
+    * added LSB support with patch from David Härdeman (Closes: #385906)
   [Mattia Dongili]:
-  * set a decent name for the _maintenance_ team.
-  * add UML_SWITCH_CTL to defaults file for easier customization.
-  * add uml_mkcow and jail_uml manpages.
-  * mention COW files advantages and how to see their actual 
-    disk usage in uml_moo and uml_mkcow manpages. (Closes: #173302)
+    * Remove obsolete MAKEDEV invocation and udev/makedev dependencies
+      (Closes: #434161)
+    * Create /var/run/uml-utilities if it doesn't exist at uml_switch startup
+      (Closes: #434784)
+    * set a decent name for the _maintenance_ team.
+    * add UML_SWITCH_CTL to defaults file for easier customization.
+    * add uml_mkcow and jail_uml manpages.
+    * mention COW files advantages and how to see their actual 
+      disk usage in uml_moo and uml_mkcow manpages. (Closes: #173302)
 
- -- Stefano Melchior <stefano.melchior at openlabs.it>  Thu, 23 Nov 2006 08:52:51 +0200
+ -- Mattia Dongili <malattia at debian.org>  Sun, 19 Aug 2007 15:39:38 +0900
 
 uml-utilities (20060323-3) unstable; urgency=low
 

Modified: trunk/src/uml-utilities/debian/uml-utilities.init
===================================================================
--- trunk/src/uml-utilities/debian/uml-utilities.init	2007-08-19 06:52:04 UTC (rev 295)
+++ trunk/src/uml-utilities/debian/uml-utilities.init	2007-08-19 10:58:14 UTC (rev 296)
@@ -20,13 +20,14 @@
 DAEMON=/usr/bin/uml_switch
 NAME=uml_switch
 DESC="User-mode networking switch"
-PIDFILE=/var/run/uml-utilities/$NAME.pid
+UML_DIR=/var/run/uml-utilities
+PIDFILE=$UML_DIR/$NAME.pid
 
 test -x $DAEMON || exit 0
 
 UML_SWITCH_OPTIONS=""
 UML_SWITCH_USER="uml-net"
-UML_SWITCH_CTL="/var/run/uml-utilities/uml_switch.ctl"
+UML_SWITCH_CTL="$UML_DIR/uml_switch.ctl"
 
 if [ -e /etc/default/uml-utilities ]; then
   . /etc/default/uml-utilities
@@ -39,17 +40,19 @@
 	if [ "x$UML_SWITCH_START" = "xfalse" ] ; then
 		[ "$VERBOSE" = "yes" ] && log_warning_msg "$DESC disabled"
 		exit 0
-	else
-		echo -n " $NAME"
 	fi
+	# create $UML_DIR if it doesn't exist (RAMRUN=yes in /etc/default/rcS)
+	if [ ! -d "$UML_DIR" ] ; then
+		mkdir -p $UML_DIR
+		chown uml-net:uml-net $UML_DIR
+	fi
         log_daemon_msg "Starting $DESC" "$NAME"
-	if start-stop-daemon --start --quiet --pidfile $PIDFILE \
-            --make-pidfile --background --chuid $UML_SWITCH_USER \
+	if ! start-stop-daemon --start --quiet --pidfile $PIDFILE \
+			--make-pidfile --background --chuid $UML_SWITCH_USER \
 			--exec $DAEMON -- $OPTIONS; then
-			log_end_msg 0
-		else
-			log_end_msg 1
-		fi
+		log_end_msg 1
+		exit 1
+	fi
 
         WAIT=5
         while ! test -e $UML_SWITCH_CTL; do
@@ -63,18 +66,16 @@
         done
 
         chmod 777 $UML_SWITCH_CTL
-	echo "."
 	log_end_msg 0
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
         if start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 			--oknodo --exec $DAEMON; then 
-        	rm -f $PIDFILE $UML_SWITCH_CTL $UML_SWITCH_DATA
-		echo "."
+		rm -f $PIDFILE $UML_SWITCH_CTL $UML_SWITCH_DATA
 		log_end_msg 0
 	else
-	    log_end_msg 1
+		log_end_msg 1
 	fi
 	;;
   restart|force-reload)