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

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-12 10:02:05 +0000 (Sat, 12 Nov 2005)
New Revision: 105

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
  * Get update-rc.d to understand symlinks to /etc/init.d/ as well as
    symlinks to ../init.d/. (Closes: #338666)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-12 09:56:36 UTC (rev 104)
+++ sysvinit/trunk/debian/changelog	2005-11-12 10:02:05 UTC (rev 105)
@@ -9,6 +9,8 @@
   * Add sysv-rc-conf(8) to the SEE ALSO section of update-rc.d(8).
   * Add suggest to bum for sysv-rc.  Also added bum(8) to the SEE ALSO
     section of update-rc.d(8). (Closes: #332823)
+  * Get update-rc.d to understand symlinks to /etc/init.d/ as well as
+    symlinks to ../init.d/. (Closes: #338666)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Oct 2005 17:08:47 +0200
 

Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2005-11-12 09:56:36 UTC (rev 104)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2005-11-12 10:02:05 UTC (rev 105)
@@ -71,8 +71,8 @@
 	if (! defined $linkdst) {
 	    die ("update-rc.d: error reading symbolic link: $!\n");
 	}
-	if (($linkdst ne "../init.d/$bn") && ($linkdst ne "../init.d/$bn")) {
-	    print STDERR "update-rc.d: warning: $fn is not a link to ../init.d/$bn\n";
+	if (($linkdst ne "../init.d/$bn") && ($linkdst ne "$initd/$bn")) {
+	    print STDERR "update-rc.d: warning: $fn is not a link to ../init.d/$bn or $initd/$bn\n";
 	    return 0;
 	}
     }