diff options
| author | maximilian attems <maks@debian.org> | 2005-10-24 09:00:59 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2005-10-24 09:00:59 +0200 |
| commit | 4fa9959b55e1d5047eb27c6dbe4fd843f93118a4 (patch) | |
| tree | f90e213b0f9aa78c470ac94068aa444efabfc330 | |
| parent | 17fed79e0dfb4fb5625a8195188d3d47da93391a (diff) | |
| download | initramfs-tools-4fa9959b55e1d5047eb27c6dbe4fd843f93118a4.tar.gz initramfs-tools-4fa9959b55e1d5047eb27c6dbe4fd843f93118a4.zip | |
fix the lib deps of the hooks, run them before mklibs-copy.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | mkinitramfs | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 3e5c166..8d38141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +initramfs-tools (0.35) unstable; urgency=low + + * mkinitramfs: Return 2 for failure path of --supported-(host|target)-version. + + * mkinitramfs: Run the hooks before mklibs-copy, broke evms. + thanks to Steinar H. Gunderson <sesse@debian.org> + + -- maximilian attems <maks@sternwelten.at> Mon, 24 Oct 2005 08:57:55 +0200 + initramfs-tools (0.32) unstable; urgency=low [ Bastian Blank ] diff --git a/mkinitramfs b/mkinitramfs index 3f0d79b..d03c346 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -66,7 +66,7 @@ if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then if [ -n "$supported_target_version" ]; then target_upstream_version="${supported_target_version%%-*}" if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then - exit 1 + exit 2 fi fi exit 0 @@ -192,6 +192,9 @@ cp /sbin/mdrun "${DESTDIR}/sbin" # LVM cp /lib/lvm-200/vgchange "${DESTDIR}/sbin" +run_scripts /usr/share/initramfs-tools/hooks +run_scripts /etc/mkinitramfs/hooks + mklibs-copy -d "${DESTDIR}/lib" --root="${DESTDIR}" $(find "${DESTDIR}" -type f -perm +0111 -o -name '*.so') ln -s /usr/lib/klibc/bin/* "${DESTDIR}/bin" @@ -200,9 +203,6 @@ ln -s /usr/lib/klibc/lib/* "${DESTDIR}/lib" rm "${DESTDIR}/bin/sh" ln -s busybox "${DESTDIR}/bin/sh" -run_scripts /usr/share/initramfs-tools/hooks -run_scripts /etc/mkinitramfs/hooks - # Apply DSDT to initramfs if [ -e "${CONFDIR}/DSDT.aml" ]; then cp "${CONFDIR}/DSDT.aml" "${DESTDIR}" |