Author: glen
Date: Fri Apr 3 00:59:19 2009
New Revision: 10292
Modified:
geninitrd/trunk/geninitrd
Log:
- formatting cosmetics
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Fri Apr 3 00:59:19 2009
@@ -1068,22 +1068,22 @@
fi
case "$INITRDFS" in
- ext2)
- [ -x /sbin/mke2fs ] || die "/sbin/mke2fs is missing"
- ;;
- rom|romfs)
- [ -x /sbin/genromfs ] || die "/sbin/genromfs is missing"
- ;;
- cram|cramfs)
- [ -x /sbin/mkcramfs ] || die "/sbin/mkcramfs is missing"
- ;;
- initramfs)
- [ -x /bin/cpio ] || die "/bin/cpio is missing"
- [ -x /usr/bin/find ] || die "/usr/bin/find is missing"
- ;;
- *)
- die "Filesystem $INITRDFS on initrd is not supported"
- ;;
+ ext2)
+ [ -x /sbin/mke2fs ] || die "/sbin/mke2fs is missing"
+ ;;
+ rom|romfs)
+ [ -x /sbin/genromfs ] || die "/sbin/genromfs is missing"
+ ;;
+ cram|cramfs)
+ [ -x /sbin/mkcramfs ] || die "/sbin/mkcramfs is missing"
+ ;;
+ initramfs)
+ [ -x /bin/cpio ] || die "/bin/cpio is missing"
+ [ -x /usr/bin/find ] || die "/usr/bin/find is missing"
+ ;;
+ *)
+ die "Filesystem $INITRDFS on initrd is not supported"
+ ;;
esac
if [ -L "$target" ]; then
@@ -1313,45 +1313,45 @@
debug "Creating $INITRDFS image $IMAGE"
case "$INITRDFS" in
- ext2)
- IMAGESIZE=$(du -ks $DESTDIR | awk '{print
int(($1+1023+512)/1024)*1024}')
- debug "ext2 image size: $IMAGESIZE ($DESTDIR)"
- if [ "$IMAGESIZE" -gt 4096 ]; then
- warn "Your image size is larger than 4096, Be sure to
boot kernel with ramdisk_size=$IMAGESIZE!"
- fi
+ ext2)
+ IMAGESIZE=$(du -ks $DESTDIR | awk '{print
int(($1+1023+512)/1024)*1024}')
+ debug "ext2 image size: $IMAGESIZE ($DESTDIR)"
+ if [ "$IMAGESIZE" -gt 4096 ]; then
+ warn "Your image size is larger than 4096, Be sure to boot
kernel with ramdisk_size=$IMAGESIZE!"
+ fi
- dd if=/dev/zero of="$IMAGE" bs=1k count="$IMAGESIZE" 2>
/dev/null
- mke2fs -q -F -b 1024 -m 0 "$IMAGE" 2>/dev/null 1>&2
- tune2fs -i 0 "$IMAGE" >/dev/null 2>&1
-
- local tmpmnt=$(mktemp -d -t initrd.mnt-XXXXXX)
- debug "Mounting ext2 image $IMAGE to $tmpmnt"
- mount -o loop -t ext2 "$IMAGE" "$tmpmnt"
- # We don't need this directory, so let's save space
- rm -rf "$tmpmnt"/lost+found
-
- debug "Copy recursively $DESTDIR -> $tmpmnt"
- cp -a $DESTDIR/* $tmpmnt
- umount "$IMAGE"
- rmdir "$tmpmnt"
-
- ;;
- rom|romfs)
- genromfs -f "$IMAGE" -d "$DESTDIR" -V "PLD initrd for kernel
$kernel"
- IMAGESIZE=$(stat -c %s $IMAGE | awk '{print
int((($1/1024)+1023)/1024)*1024}')
- debug "Image size for romfs: ${IMAGESIZE}KiB ($IMAGE)"
- if [ "$IMAGESIZE" -gt 4096 ]; then
- warn "Your image size is larger than 4096, Be sure to
boot kernel with ramdisk_size=$IMAGESIZE!"
- fi
- ;;
- cram|cramfs)
- mkcramfs "$DESTDIR" "$IMAGE"
- ;;
- initramfs)
- (cd $DESTDIR; find . | cpio --quiet -H newc -o > "$IMAGE")
- ;;
- *)
- echo "Filesystem $INITRDFS not supported by $PROGRAM";
+ dd if=/dev/zero of="$IMAGE" bs=1k count="$IMAGESIZE" 2> /dev/null
+ mke2fs -q -F -b 1024 -m 0 "$IMAGE" 2>/dev/null 1>&2
+ tune2fs -i 0 "$IMAGE" >/dev/null 2>&1
+
+ local tmpmnt=$(mktemp -d -t initrd.mnt-XXXXXX)
+ debug "Mounting ext2 image $IMAGE to $tmpmnt"
+ mount -o loop -t ext2 "$IMAGE" "$tmpmnt"
+ # We don't need this directory, so let's save space
+ rm -rf "$tmpmnt"/lost+found
+
+ debug "Copy recursively $DESTDIR -> $tmpmnt"
+ cp -a $DESTDIR/* $tmpmnt
+ umount "$IMAGE"
+ rmdir "$tmpmnt"
+
+ ;;
+ rom|romfs)
+ genromfs -f "$IMAGE" -d "$DESTDIR" -V "PLD initrd for kernel $kernel"
+ IMAGESIZE=$(stat -c %s $IMAGE | awk '{print
int((($1/1024)+1023)/1024)*1024}')
+ debug "Image size for romfs: ${IMAGESIZE}KiB ($IMAGE)"
+ if [ "$IMAGESIZE" -gt 4096 ]; then
+ warn "Your image size is larger than 4096, Be sure to boot
kernel with ramdisk_size=$IMAGESIZE!"
+ fi
+ ;;
+ cram|cramfs)
+ mkcramfs "$DESTDIR" "$IMAGE"
+ ;;
+ initramfs)
+ (cd $DESTDIR; find . | cpio --quiet -H newc -o > "$IMAGE")
+ ;;
+ *)
+ echo "Filesystem $INITRDFS not supported by $PROGRAM";
esac
if is_yes "$COMPRESS"; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
