From 01bcfb0c22a98d3744e848ce581050f527dc9f03 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Sat, 5 May 2007 22:50:24 +0000 Subject: It might be more convenient to use the mkfs.ext2 out of rootfilesystem than copying it into initramfs (unless available via busybox again) ... (Same principle is used for ldconfig already) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1008 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/bin/hwautocfg | 2 +- initramfs/initrd-stuff/etc/functions | 2 +- initramfs/mkdxsinitrd | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index 0e7e88b0..a9c4cebc 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -414,7 +414,7 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \ for hdpartnr in $(cat /tmp/hd_part | \ sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do # ext2fs_check_if_mount message supressed - ( mkfs.ext2 -Fq $hdpartnr 2>/dev/null + ( LD_LIBRARY_PATH=/mnt/lib /mnt/sbin/mkfs.ext2 -Fq $hdpartnr 2>/dev/null umount /mnt/tmp 2>/dev/null # if mounting of temp partion fails fall back to tmpfs on /tmp mount -t ext2 -n -o nocheck,noexec $hdpartnr /mnt/tmp 2>/dev/null || \ diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index b01884f4..5e2157e1 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -29,7 +29,7 @@ postinit () { config_distro () { : } -# udev/hotplug - auto device discovery service +# udev/hotplug - auto device discovery service (deprecated) udev_hotplug () { : } diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 5e566a85..88e1ea67 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -422,8 +422,9 @@ done echo -e "#!/bin/ash\n/bin/ash \$@" > ${INSTDIR}/bin/sh chmod a+x ${INSTDIR}/bin/sh -# fixme: add ext2 stuff until busybox offers these tools again -cobi mkfs.ext2 bin +# fixme: add ext2 stuff until busybox offers these tools again or use mkfs.ext2 +# out of mounted root filesystem (more convenient)?? +#cobi mkfs.ext2 bin # binaries useful for debugging purposes if [ $IRFSDEBUG -gt 2 ] ; then -- cgit v1.2.3-55-g7522