[kernel] r14647 - dists/trunk/linux-2.6/debian/templates/temp.image.plain

[Maximilian Attems]

Author: maks
Date: Tue Nov 17 14:52:25 2009
New Revision: 14647

Log:
prerm no need to remove modules.dep

we do it anyway on postrm

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Tue Nov 17 13:27:20 2009	(r14646)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Tue Nov 17 14:52:25 2009	(r14647)
@@ -159,7 +159,7 @@
 chdir("/") or die "could not chdir to /:$!\n";
 
 if (-f "/etc/$loader.conf") { #I know, could be a link, but ..
-  open (LILO, "/etc/$loader.conf") || &success(); # this is not critical
+  open (LILO, "/etc/$loader.conf"); # this is not critical
   while (<LILO>) {
     chop;
     s/\#.*//;			  # nix the comments
@@ -173,11 +173,11 @@
 	$WouldInvalidate |= $image =~ /$kimage-$version/;
       }
       else {
-	&success(); # invalid $loader.conf file
+	last; # invalid $loader.conf file
       }
     }
     else {
-      &success(); # invalid $loader.conf file
+      last; # invalid $loader.conf file
     }
   }
   close (LILO);
@@ -212,7 +212,6 @@
     }
     else {
       print STFERR "Ok, proceeding with removing running kernel image.\n";
-      &success();
     }
   }
 }
@@ -286,14 +285,5 @@
             die "Failed to process /etc/kernel/prerm.d/$version";
 }
 
-sub success () {
-    -f "/lib/modules/$version/modules.dep"  && 
-      unlink "/lib/modules/$version/modules.dep";
-    exit 0;
-}
-
-
-
-&success();
 exit 0;
 __END__