diff options
| author | maximilian attems <maks@debian.org> | 2005-11-17 21:04:24 +0100 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2005-11-17 21:04:24 +0100 |
| commit | 6c4e2850f0bc8c554a0faf9b9becc879a8dc53c5 (patch) | |
| tree | b0e504243fb2c3cf56732903c6aa1d58ccce9af9 | |
| parent | b69379d8aba5cb2cf30f1786c547385e1d401cd8 (diff) | |
| download | initramfs-tools-6c4e2850f0bc8c554a0faf9b9becc879a8dc53c5.tar.gz initramfs-tools-6c4e2850f0bc8c554a0faf9b9becc879a8dc53c5.zip | |
sync with latest ubuntu:
* typo in mkinitramfs -d handling
* only cp klibc-*.so file
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rwxr-xr-x | mkinitramfs | 4 |
2 files changed, 19 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 1cf51c0..398378d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,11 +10,26 @@ initramfs-tools (0.39) unstable; urgency=low * Pump udev dependency. * init: Pump timeout as there is currently no way to check which udevd - processes are still running and why. Cures hopefully breakage of missing - devices. + processes are still running and why. + Cures hopefully breakage of missing devices on boot. + + * Sync with latest Ubuntu. -- maximilian attems <maks@sternwelten.at> Thu, 17 Nov 2005 19:59:47 +0100 +initramfs-tools (0.36ubuntu3) dapper; urgency=low + + * mkinitramfs: only copy the klibc-*.so file, and not the development + pieces that happen to sit alongside it. + + -- Scott James Remnant <scott@ubuntu.com> Thu, 10 Nov 2005 16:44:08 -0500 + +initramfs-tools (0.36ubuntu2) dapper; urgency=low + + * Fix typos in the handling of the mkinitramfs -d option (thanks, Colin). + + -- Adam Conrad <adconrad@ubuntu.com> Thu, 10 Nov 2005 12:12:32 -0500 + initramfs-tools (0.38) unstable; urgency=low [ dann frazier ] diff --git a/mkinitramfs b/mkinitramfs index 529defc..8e390cd 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -22,7 +22,7 @@ while true; do -d) CONFDIR="$2" shift 2 - if [ ! d "${CONFDIR}" ]; then + if [ ! -d "${CONFDIR}" ]; then echo "${0}: ${CONFDIR}: Not a directory" >&2 exit 1 fi @@ -159,7 +159,7 @@ fi # symlinks. ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin -ln -s /usr/lib/klibc/lib/* ${DESTDIR}/lib +ln -s /usr/lib/klibc/lib/klibc-*.so ${DESTDIR}/lib copy_exec /usr/share/initramfs-tools/init /init cp -a /usr/share/initramfs-tools/scripts/* "${DESTDIR}/scripts" for f in $(cd /etc/mkinitramfs/scripts && \ |