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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 09:36:34 +0000 (Fri, 08 Sep 2006)
New Revision: 864

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
  * Make sure running update-rc.d several times do not remove the rc*.d/
    symlinks. (Closes: #386500)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 08:55:47 UTC (rev 863)
+++ sysvinit/trunk/debian/changelog	2006-09-08 09:36:34 UTC (rev 864)
@@ -17,6 +17,8 @@
   * Mount /dev/pts/ with noexec,nosuid, as it is only used for device files.
   * 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)
 
  -- 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 08:55:47 UTC (rev 863)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2006-09-08 09:36:34 UTC (rev 864)
@@ -113,10 +113,11 @@
 		print "   $fn is not a link to ../init.d/$bn; not removing\n"; 
 		next;
 	    }
-	    print "   $etcd$i.d/$_\n";
-	    next if ($notreally);
-	    unlink ("$etcd$i.d/$_") ||
-		die("update-rc.d: unlink: $!\n");
+	    if (!$notreally && defined $_[0] && $_[0] eq 'remove') {
+		print "   $etcd$i.d/$_\n";
+		unlink ("$etcd$i.d/$_") ||
+		    die("update-rc.d: unlink: $!\n");
+	    }
 	}
 	closedir(DIR);
     }