diff options
| author | maximilian attems <maks@debian.org> | 2006-07-07 12:05:34 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-07-07 12:05:34 +0200 |
| commit | f82a46fac97eee643cbd8600657f533a6e31665f (patch) | |
| tree | 63c90cbc9348f0ee9bd06ba02ec6531e2e6e17f0 /mkinitramfs | |
| parent | af6f5f475221846f88a2bbda39a2a93d67556d07 (diff) | |
| download | initramfs-tools-f82a46fac97eee643cbd8600657f533a6e31665f.tar.gz initramfs-tools-f82a46fac97eee643cbd8600657f533a6e31665f.zip | |
- mkinitramfs take care of eventual missing depmod run
- do the migration from mkinitramfs in preinst
- sed the modules file so that it looks pretty some than ours
- polish modules file
- allow BUSYBOX=n
Diffstat (limited to 'mkinitramfs')
| -rwxr-xr-x | mkinitramfs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mkinitramfs b/mkinitramfs index f0ba606..f532228 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -112,6 +112,9 @@ if [ ! -e "${MODULESDIR}" ]; then echo "Cannot find ${MODULESDIR}" exit 1 fi +if [ ! -e "${MODULESDIR}/modules.depmod" ]; then + depmod ${version} +fi DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1 __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1 @@ -175,9 +178,14 @@ done echo "ROOT=${ROOT}" > ${DESTDIR}/conf/conf.d/root # Busybox -rm -f ${DESTDIR}/bin/sh -copy_exec ${BUSYBOXDIR}/busybox /bin/busybox -ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh +if [ "x${BUSYBOX}" = "xn" ]; then + ln -s ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh + echo "Warning: Busybox is required for successful boot!" +else + rm -f ${DESTDIR}/bin/sh + copy_exec ${BUSYBOXDIR}/busybox /bin/busybox + ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh +fi # Modutils copy_exec /sbin/modprobe /sbin |