diff options
| author | maximilian attems <maks@debian.org> | 2005-11-23 10:12:17 +0100 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2005-11-23 10:12:17 +0100 |
| commit | 08319e643dc6743bc4f366942e15ea2cf4000c9e (patch) | |
| tree | 4a1a48effe7b28466ed30b1141952cb590b80c6e | |
| parent | b270bb806236c50163f5d4139d92ba36c1b20846 (diff) | |
| download | initramfs-tools-08319e643dc6743bc4f366942e15ea2cf4000c9e.tar.gz initramfs-tools-08319e643dc6743bc4f366942e15ea2cf4000c9e.zip | |
resynch with ubuntu:
use $CONFDIR everywhere in mkinitramfs
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | mkinitramfs | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 2742915..79d36ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,14 @@ initramfs-tools (0.39) unstable; urgency=medium -- maximilian attems <maks@sternwelten.at> Thu, 17 Nov 2005 19:59:47 +0100 +initramfs-tools (0.36ubuntu4) dapper; urgency=low + + * Replace all occurances of /etc/mkinitramfs in mkinitramfs with $CONFDIR, + so -d can be used to point at a completely alternate tree (for example, + when installing into a chroot). + + -- Scott James Remnant <scott@ubuntu.com> Mon, 21 Nov 2005 08:34:03 +0000 + initramfs-tools (0.36ubuntu3) dapper; urgency=low * mkinitramfs: only copy the klibc-*.so file, and not the development diff --git a/mkinitramfs b/mkinitramfs index 8e390cd..612f2d7 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -162,11 +162,11 @@ ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin 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 && \ +for f in $(cd ${CONFDIR}/scripts && \ find . \( -name '*.dpkg*' -prune -o -name '*~' -prune \) \ -o -type f -print); do mkdir --parents "${DESTDIR}/scripts/$(dirname "${f}")" -cp -p "/etc/mkinitramfs/scripts/${f}" "${DESTDIR}/scripts/$(dirname "${f}")" +cp -p "${CONFDIR}/scripts/${f}" "${DESTDIR}/scripts/$(dirname "${f}")" done copy_exec "${CONFDIR}/initramfs.conf" /conf cp -a /etc/udev "${DESTDIR}/etc" |