Rev 390: don't block SIGCHLD, or we lose return values from system() ! in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 390
revision-id: tridge at samba.org-20070529072329-y1wnscebfnwlk63p
parent: tridge at samba.org-20070529070008-jdte02ed9d9c8z4b
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Tue 2007-05-29 17:23:29 +1000
message:
  don't block SIGCHLD, or we lose return values from system() !
  nicer log messages from events script
modified:
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  tools/events                   events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c	2007-05-29 03:58:41 +0000
+++ b/common/ctdb_daemon.c	2007-05-29 07:23:29 +0000
@@ -734,7 +734,6 @@
 		setsid();
 	}
 	block_signal(SIGPIPE);
-	block_signal(SIGCHLD);
 
 	/* try to set us up as realtime */
 	ctdb_set_realtime();

=== modified file 'tools/events'
--- a/tools/events	2007-05-29 06:28:18 +0000
+++ b/tools/events	2007-05-29 07:23:29 +0000
@@ -13,8 +13,11 @@
 	iface=$1
 	ip=$2
 	maskbits=$3
-	exec /sbin/ip addr add $ip/$maskbits dev $iface
-	exit 1
+	/sbin/ip addr add $ip/$maskbits dev $iface || {
+		 echo "Failed to add $ip/$maskbits on dev $iface"
+		 exit 1
+	}
+	exit 0
 	;;
 
      releaseip)
@@ -25,8 +28,11 @@
 	iface=$1
 	ip=$2
 	maskbits=$3
-	exec /sbin/ip addr del $ip dev $iface
-	exit 1
+	/sbin/ip addr del $ip dev $iface || {
+		 echo "Failed to del $ip on dev $iface"
+		 exit 1
+	}
+	exit 0
 	;;
 
      recovered)