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

[Maximilian Attems]

Author: maks
Date: Mon Jul 27 12:27:56 2009
New Revision: 14034

Log:
keep the hook variable in their respective Maintainer script

they are unused anywhere else.

Modified:
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/config
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
   dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/config
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:27:45 2009	(r14033)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/config	Mon Jul 27 12:27:56 2009	(r14034)
@@ -29,10 +29,6 @@
 my $image_dir         = "=D";        # where the image is located
 my $relative_links    = "";          # target machine defined
 my $use_hard_links    = ''; # hardlinks do not work across fs boundaries
-my $postinst_hook     = '';          #Normally we do not
-my $postrm_hook       = '';          #Normally we do not
-my $preinst_hook      = '';          #Normally we do not
-my $prerm_hook        = '';          #Normally we do not
 my $minimal_swap      = '';          # Do not swap symlinks
 my $ignore_depmod_err = '';          # normally we do not
 my $relink_src_link   = 'YES'; # There is no harm in checking the link
@@ -91,10 +87,6 @@
       $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/ig;
-      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
-      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
-      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
     }
     close CONF;
     $have_conffile = "Yes";

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:27:45 2009	(r14033)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Mon Jul 27 12:27:56 2009	(r14034)
@@ -39,9 +39,6 @@
 my $mkimage           = "=M";   # command to generate the initrd image
 my $use_hard_links    = ''; # hardlinks do not work across fs boundaries
 my $postinst_hook     = '';          #Normally we do not
-my $postrm_hook       = '';          #Normally we do not
-my $preinst_hook      = '';          #Normally we do not
-my $prerm_hook        = '';          #Normally we do not
 my $minimal_swap      = '';          # Do not swap symlinks
 my $ignore_depmod_err = '';          # normally we do not
 my $relink_src_link   = 'YES'; # There is no harm in checking the link
@@ -137,9 +134,6 @@
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
       $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/ig;
-      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
-      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
-      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
       $mkimage         = "$1"  if /mkimage\s*=\s*(.+)$/ig;
       $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
     }

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Mon Jul 27 12:27:45 2009	(r14033)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postrm	Mon Jul 27 12:27:56 2009	(r14034)
@@ -46,10 +46,7 @@
 my $loader            = "=L";     # lilo, silo, quik, palo, vmelilo, or nettrom
 my $image_dir         = "=D";     # where the image is located
 my $use_hard_links    = '';       # hardlinks do not work across fs boundaries
-my $postinst_hook     = '';       #Normally we do not
 my $postrm_hook       = '';       #Normally we do not
-my $preinst_hook      = '';       #Normally we do not
-my $prerm_hook        = '';       #Normally we do not
 my $minimal_swap      = '';       # Do not swap symlinks
 my $ignore_depmod_err = '';	# normally we do not
 my $relink_build_link = 'YES';	# There is no harm in checking the link
@@ -134,10 +131,7 @@
       $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/ig;
       $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
-      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
-      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
     }
     close CONF;
     $have_conffile = "Yes";

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Mon Jul 27 12:27:45 2009	(r14033)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/preinst	Mon Jul 27 12:27:56 2009	(r14034)
@@ -32,10 +32,7 @@
 my $kimage          = "=K";     # Should be empty, mostly
 my $image_dir       = "=D";     # where the image is located
 my $use_hard_links  = '';       # hardlinks do not wirk across fs boundaries
-my $postinst_hook   = '';       #Normally we do not
-my $postrm_hook     = '';       #Normally we do not
 my $preinst_hook    = '';       #Normally we do not
-my $prerm_hook      = '';       #Normally we do not
 my $minimal_swap    = '';       # Do not swap symlinks
 my $ignore_depmod_err = '';    # normally we do not
 my $relink_src_link   = 'YES';	# There is no harm in checking the link
@@ -107,10 +104,7 @@
       $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/ig;
-      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
       $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
-      $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
       $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
     }
     close CONF;

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Mon Jul 27 12:27:45 2009	(r14033)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/prerm	Mon Jul 27 12:27:56 2009	(r14034)
@@ -34,9 +34,6 @@
 my $loader          = "=L";     # lilo, silo, quik, palo, vmelilo, or nettrom
 my $image_dir       = "=D";     # where the image is located
 my $use_hard_links  = '';       # hardlinks do not wirk across fs boundaries
-my $postinst_hook   = '';       #Normally we do not
-my $postrm_hook     = '';       #Normally we do not
-my $preinst_hook    = '';       #Normally we do not
 my $prerm_hook      = '';       #Normally we do not
 my $minimal_swap    = '';       # Do not swap symlinks
 my $ignore_depmod_err = '';	# normally we do not
@@ -137,9 +134,6 @@
       $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/ig;
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/ig;
-      $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/ig;
-      $postrm_hook     = "$1"  if /postrm_hook\s*=\s*(\S+)/ig;
-      $preinst_hook    = "$1"  if /preinst_hook\s*=\s*(\S+)/ig;
       $prerm_hook      = "$1"  if /prerm_hook\s*=\s*(\S+)/ig;
     }
     close CONF;