diff options
| author | maximilian attems <maks@debian.org> | 2006-08-23 09:22:54 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-08-23 09:22:54 +0200 |
| commit | fabe918dee7da26d177d67d4aa8fe3fd6e83e513 (patch) | |
| tree | 5dee066c10e912f5328dba7de3032cd6058019dc /update-initramfs | |
| parent | d1d6763409a1260708423e0092d7bc4182275773 (diff) | |
| download | initramfs-tools-fabe918dee7da26d177d67d4aa8fe3fd6e83e513.tar.gz initramfs-tools-fabe918dee7da26d177d67d4aa8fe3fd6e83e513.zip | |
- improved nfsroo parsing
- added rootdelay and rootfstype bootargs
- document this changes
- initrd-tools backward compatible mdadm assembe and then run mdrun
- update-initramfs really checkout use_bootloader from /etc/kernel-img.conf
- tighter klibc deps
Diffstat (limited to 'update-initramfs')
| -rwxr-xr-x | update-initramfs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/update-initramfs b/update-initramfs index 3ce8f1f..1ec8c7d 100755 --- a/update-initramfs +++ b/update-initramfs @@ -2,6 +2,7 @@ STATEDIR=/var/lib/initramfs-tools BOOTDIR=/boot +KPKGCONF=/etc/kernel-img.conf set -e @@ -96,8 +97,8 @@ run_bootloader() { if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then if [ -e /etc/lilo.conf ]; then - do_b=$(awk '/bootloader/{print $2}' \ - /etc/kernel-img.conf) + [ -r "${KPKGCONF}" ] && \ + do_b=$(awk '/bootloader/{print $3}' "${KPKGCONF}") if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \ || [ "${do_b}" = "YES" ]; then run_lilo |