[Pkg-sysvinit-commits] r865 - in sysvinit/trunk/debian: . sysv-rc/sbin

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 09:44:17 +0000 (Fri, 08 Sep 2006)
New Revision: 865

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
Use patch from Arjan Oosting instead.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 09:36:34 UTC (rev 864)
+++ sysvinit/trunk/debian/changelog	2006-09-08 09:44:17 UTC (rev 865)
@@ -18,7 +18,7 @@
   * Print a message when enabling concurrent boot, specifying the
     concurrency style.
   * Make sure running update-rc.d several times do not remove the rc*.d/
-    symlinks. (Closes: #386500)
+    symlinks.  Patch from Arjan Oosting. (Closes: #386500)
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 15:41:23 +0200
 

Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2006-09-08 09:36:34 UTC (rev 864)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2006-09-08 09:44:17 UTC (rev 865)
@@ -108,16 +108,15 @@
 	    $fn = "$etcd$i.d/$_";
 	    $found = 1;
 	    $islnk = &is_link ($_[0], $fn, $bn);
-	    next if (defined $_[0] and $_[0] ne 'remove');
+	    next unless (defined $_[0] and $_[0] eq 'remove');
 	    if (! $islnk) {
 		print "   $fn is not a link to ../init.d/$bn; not removing\n"; 
 		next;
 	    }
-	    if (!$notreally && defined $_[0] && $_[0] eq 'remove') {
-		print "   $etcd$i.d/$_\n";
-		unlink ("$etcd$i.d/$_") ||
-		    die("update-rc.d: unlink: $!\n");
-	    }
+	    print "   $etcd$i.d/$_\n";
+	    next if ($notreally);
+	    unlink ("$etcd$i.d/$_") ||
+		die("update-rc.d: unlink: $!\n");
 	}
 	closedir(DIR);
     }