Bug#568317: linux-image-* postinst did not correctly run lilo
Dear Ben,
> ... If you can provide patches, that would be most helpful.
See below. I now see that the sources of these files are in package
kernel-package (I do not know how that relates to linux-2.6).
I only patched the spurious /g modifiers and "cleaned up" the patterns
e.g. to anchor at the beginning; did not drop the unnecessary my().
Cheers, Paul
Paul Szabo psz@maths.usyd.edu.au http://www.maths.usyd.edu.au/u/psz/
School of Mathematics and Statistics University of Sydney Australia
--- usr/share/kernel-package/pkg/headers/postinst.bak 2008-05-02 15:06:28.000000000 +1000
+++ usr/share/kernel-package/pkg/headers/postinst 2010-02-05 10:30:23.000000000 +1100
@@ -146,8 +146,8 @@
s/\#.*$//g;
next if /^\s*$/;
- $src_postinst_hook = "$1" if /src_postinst_hook\s*=\s*(\S+)/ig;
- $header_postinst_hook = "$1" if /header_postinst_hook\s*=\s*(\S+)/ig;
+ $src_postinst_hook = "$1" if m/^\s*src_postinst_hook\s*=\s*(\S+)\s*$/i;
+ $header_postinst_hook = "$1" if m/^\s*header_postinst_hook\s*=\s*(\S+)\s*$/i;
}
close CONF;
$have_conffile = "Yes";
--- usr/share/kernel-package/pkg/source/postinst.bak 2008-05-02 15:06:28.000000000 +1000
+++ usr/share/kernel-package/pkg/source/postinst 2010-02-05 10:31:06.000000000 +1100
@@ -57,7 +57,7 @@
s/\#.*$//g;
next if /^\s*$/;
- $src_postinst_hook = "$1" if /src_postinst_hook\s*=\s*(\S+)/ig;
+ $src_postinst_hook = "$1" if m/^\s*src_postinst_hook\s*=\s*(\S+)\s*$/i;
}
close CONF;
$have_conffile = "Yes";
--- usr/share/kernel-package/pkg/doc/postinst.bak 2008-05-02 15:06:28.000000000 +1000
+++ usr/share/kernel-package/pkg/doc/postinst 2010-02-05 10:31:51.000000000 +1100
@@ -57,7 +57,7 @@
s/\#.*$//g;
next if /^\s*$/;
- $src_postinst_hook = "$1" if /src_postinst_hook\s*=\s*(\S+)/ig;
+ $src_postinst_hook = "$1" if m/^\s*src_postinst_hook\s*=\s*(\S+)\s*$/i;
}
close CONF;
$have_conffile = "Yes";
--- usr/share/kernel-package/pkg/image/postinst.bak 2008-11-25 04:01:32.000000000 +1100
+++ usr/share/kernel-package/pkg/image/postinst 2010-02-05 10:43:59.000000000 +1100
@@ -116,60 +116,60 @@
warn "Option image_in_boot is deprecated, and will go away. Use link_in_boot instead.\n"
if m/image_in_boot\s*=\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;
- $reverse_symlink = "" if /reverse_symlink\s*=\s*(no|false|0)\s*$/ig;
- $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/ig;
- $link_in_boot = "" if /image_in_boot\s*=\s*(no|false|0)\s*$/ig;
- $move_image = "" if /move_image\s*=\s*(no|false|0)\s*$/ig;
- $clobber_modules = '' if /clobber_modules\s*=\s*(no|false|0)\s*$/ig;
- $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/ig;
- $do_bootfloppy = '' if /do_bootfloppy\s*=\s*(no|false|0)\s*$/ig;
- $relative_links = '' if /relative_links \s*=\s*(no|false|0)\s*$/ig;
- $do_bootloader = '' if /do_bootloader\s*=\s*(no|false|0)\s*$/ig;
- $do_initrd = '' if /do_initrd\s*=\s*(no|false|0)\s*$/ig;
- $warn_initrd = '' if /warn_initrd\s*=\s*(no|false|0)\s*$/ig;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/ig;
- $silent_modules = '' if /silent_modules\s*=\s*(no|false|0)\s*$/ig;
- $silent_loader = '' if /silent_loader\s*=\s*(no|false|0)\s*$/ig;
- $warn_reboot = '' if /warn_reboot\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;
- $reverse_symlink = "Yes" if /reverse_symlinks\s*=\s*(yes|true|1)\s*$/ig;
- $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/ig;
- $link_in_boot = "Yes" if /image_in_boot\s*=\s*(yes|true|1)\s*$/ig;
- $move_image = "Yes" if /move_image\s*=\s*(yes|true|1)\s*$/ig;
- $clobber_modules = "Yes" if /clobber_modules\s*=\s*(yes|true|1)\s*$/ig;
- $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/ig;
- $do_bootfloppy = "Yes" if /do_bootfloppy\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;
- $relative_links = "Yes" if /relative_links\s*=\s*(yes|true|1)\s*$/ig;
- $do_initrd = "Yes" if /do_initrd\s*=\s*(yes|true|1)\s*$/ig;
- $warn_initrd = "Yes" if /warn_initrd\s*=\s*(yes|true|1)\s*$/ig;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/ig;
- $silent_modules = 'Yes' if /silent_modules\s*=\s*(yes|true|1)\s*$/ig;
- $silent_loader = 'Yes' if /silent_loader\s*=\s*(yes|true|1)\s*$/ig;
- $warn_reboot = 'Yes' if /warn_reboot\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;
- $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;
+ $do_symlink = "" if m/^\s*do_symlinks\s*=\s*(no|false|0)\s*$/i;
+ $no_symlink = "" if m/^\s*no_symlinks\s*=\s*(no|false|0)\s*$/i;
+ $reverse_symlink = "" if m/^\s*reverse_symlink\s*=\s*(no|false|0)\s*$/i;
+ $link_in_boot = "" if m/^\s*link_in_boot\s*=\s*(no|false|0)\s*$/i;
+ $link_in_boot = "" if m/^\s*image_in_boot\s*=\s*(no|false|0)\s*$/i;
+ $move_image = "" if m/^\s*move_image\s*=\s*(no|false|0)\s*$/i;
+ $clobber_modules = '' if m/^\s*clobber_modules\s*=\s*(no|false|0)\s*$/i;
+ $do_boot_enable = '' if m/^\s*do_boot_enable\s*=\s*(no|false|0)\s*$/i;
+ $do_bootfloppy = '' if m/^\s*do_bootfloppy\s*=\s*(no|false|0)\s*$/i;
+ $relative_links = '' if m/^\s*relative_links \s*=\s*(no|false|0)\s*$/i;
+ $do_bootloader = '' if m/^\s*do_bootloader\s*=\s*(no|false|0)\s*$/i;
+ $do_initrd = '' if m/^\s*do_initrd\s*=\s*(no|false|0)\s*$/i;
+ $warn_initrd = '' if m/^\s*warn_initrd\s*=\s*(no|false|0)\s*$/i;
+ $use_hard_links = '' if m/^\s*use_hard_links\s*=\s*(no|false|0)\s*$/i;
+ $silent_modules = '' if m/^\s*silent_modules\s*=\s*(no|false|0)\s*$/i;
+ $silent_loader = '' if m/^\s*silent_loader\s*=\s*(no|false|0)\s*$/i;
+ $warn_reboot = '' if m/^\s*warn_reboot\s*=\s*(no|false|0)\s*$/i;
+ $minimal_swap = '' if m/^\s*minimal_swap\s*=\s*(no|false|0)\s*$/i;
+ $ignore_depmod_err = '' if m/^\s*ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
+ $relink_src_link = '' if m/^\s*relink_src_link\s*=\s*(no|false|0)\s*$/i;
+ $relink_build_link = '' if m/^\s*relink_build_link\s*=\s*(no|false|0)\s*$/i;
+ $force_build_link = '' if m/^\s*force_build_link\s*=\s*(no|false|0)\s*$/i;
+
+ $do_symlink = "Yes" if m/^\s*do_symlinks\s*=\s*(yes|true|1)\s*$/i;
+ $no_symlink = "Yes" if m/^\s*no_symlinks\s*=\s*(yes|true|1)\s*$/i;
+ $reverse_symlink = "Yes" if m/^\s*reverse_symlinks\s*=\s*(yes|true|1)\s*$/i;
+ $link_in_boot = "Yes" if m/^\s*link_in_boot\s*=\s*(yes|true|1)\s*$/i;
+ $link_in_boot = "Yes" if m/^\s*image_in_boot\s*=\s*(yes|true|1)\s*$/i;
+ $move_image = "Yes" if m/^\s*move_image\s*=\s*(yes|true|1)\s*$/i;
+ $clobber_modules = "Yes" if m/^\s*clobber_modules\s*=\s*(yes|true|1)\s*$/i;
+ $do_boot_enable = "Yes" if m/^\s*do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
+ $do_bootfloppy = "Yes" if m/^\s*do_bootfloppy\s*=\s*(yes|true|1)\s*$/i;
+ $do_bootloader = "Yes" if m/^\s*do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+ $explicit_do_loader = "YES" if m/^\s*do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+ $relative_links = "Yes" if m/^\s*relative_links\s*=\s*(yes|true|1)\s*$/i;
+ $do_initrd = "Yes" if m/^\s*do_initrd\s*=\s*(yes|true|1)\s*$/i;
+ $warn_initrd = "Yes" if m/^\s*warn_initrd\s*=\s*(yes|true|1)\s*$/i;
+ $use_hard_links = "Yes" if m/^\s*use_hard_links\s*=\s*(yes|true|1)\s*$/i;
+ $silent_modules = 'Yes' if m/^\s*silent_modules\s*=\s*(yes|true|1)\s*$/i;
+ $silent_loader = 'Yes' if m/^\s*silent_loader\s*=\s*(yes|true|1)\s*$/i;
+ $warn_reboot = 'Yes' if m/^\s*warn_reboot\s*=\s*(yes|true|1)\s*$/i;
+ $minimal_swap = 'Yes' if m/^\s*minimal_swap\s*=\s*(yes|true|1)\s*$/i;
+ $ignore_depmod_err = 'Yes' if m/^\s*ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
+ $relink_src_link = 'Yes' if m/^\s*relink_src_link\s*=\s*(yes|true|1)\s*$/i;
+ $relink_build_link = 'Yes' if m/^\s*relink_build_link\s*=\s*(yes|true|1)\s*$/i;
+ $force_build_link = 'Yes' if m/^\s*force_build_link\s*=\s*(yes|true|1)\s*$/i;
+
+ $image_dest = "$1" if m/^\s*image_dest\s*=\s*(\S+)\s*$/i;
+ $postinst_hook = "$1" if m/^\s*postinst_hook\s*=\s*(\S+)\s*$/i;
+ $postrm_hook = "$1" if m/^\s*postrm_hook\s*=\s*(\S+)\s*$/i;
+ $preinst_hook = "$1" if m/^\s*preinst_hook\s*=\s*(\S+)\s*$/i;
+ $prerm_hook = "$1" if m/^\s*prerm_hook\s*=\s*(\S+)\s*$/i;
+ $mkimage = "$1" if m/^\s*mkimage\s*=\s*(\S.*)$/i;
+ $ramdisk = "$1" if m/^\s*ramdisk\s*=\s*(\S.*)$/i;
}
close CONF;
$have_conffile = "Yes";
Reply to: