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

[Ben Hutchings]

Author: benh
Date: Tue Feb 16 03:21:13 2010
New Revision: 15163

Log:
postinst: Remove bogus //g modifiers

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

Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Tue Feb 16 03:10:04 2010	(r15162)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst	Tue Feb 16 03:21:13 2010	(r15163)
@@ -82,35 +82,35 @@
       s/\#.*$//g;
       next if /^\s*$/;
 
-      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/ig;
-      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
-      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
-      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig;
-      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
-      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/ig;
-      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/ig;
-      $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/ig;
-      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/ig;
-      $force_build_link  = '' if /force_build_link\s*=\s*(no|false|0)\s*$/ig;
-
-      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/ig;
-      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
-      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
-      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/ig;
-      $explicit_do_loader = "YES" if /do_bootloader\s*=\s*(yes|true|1)\s*$/ig;
-      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
-      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/ig;
-      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/ig;
-      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/ig;
-      $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;
-      $mkimage         = "$1"  if /mkimage\s*=\s*(.+)$/ig;
-      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/ig;
+      $do_symlink      = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $no_symlink      = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
+      $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
+      $do_boot_enable  = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
+      $do_bootloader   = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
+      $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
+      $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
+      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
+      $relink_src_link   = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/i;
+      $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
+      $force_build_link  = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
+
+      $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
+      $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
+      $do_boot_enable  = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
+      $do_bootloader   = "Yes" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+      $explicit_do_loader = "YES" if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+      $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
+      $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
+      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
+      $relink_src_link   = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/i;
+      $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
+      $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
+
+      $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/i;
+      $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/i;
+      $mkimage         = "$1"  if /mkimage\s*=\s*(.+)$/i;
+      $ramdisk         = "$1"  if /ramdisk\s*=\s*(.+)$/i;
     }
     close CONF;
     $have_conffile = "Yes";
@@ -807,7 +807,7 @@
     }
 }
 die "Failed to create initrd image.\n" unless $success;
-if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/og) {
+if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/o) {
     image_magic("initrd.img", $image_dest);
 } else {
     if (! -e "initrd.img") {
@@ -818,7 +818,7 @@
 }
 
 # Only change the symlinks if we are not being upgraded
-if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/og) {
+if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/o) {
   image_magic($kimage, $image_dest);
 }
 else {