浏览代码

mkimage: allow -r f2fs or any other fs and check we have required cmds.

Juan RP 11 年之前
父节点
当前提交
81378ab3c6
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      mkimage.sh.in

+ 7 - 1
mkimage.sh.in

@@ -85,6 +85,12 @@ if [ "$(id -u)" -ne 0 ]; then
     die "need root perms to continue, exiting."
     die "need root perms to continue, exiting."
 fi
 fi
 
 
+for f in parted mkfs.${BOOT_FSTYPE} mkfs.${ROOT_FSTYPE}; do
+    if ! which ${f} >/dev/null; then
+        die "Cannot find ${f}, exiting."
+    fi
+done
+
 IMGSIZE="$2"
 IMGSIZE="$2"
 if [ -z "$IMGSIZE" ]; then
 if [ -z "$IMGSIZE" ]; then
     IMGSIZE="2G"
     IMGSIZE="2G"
@@ -111,7 +117,7 @@ if [ "$BOOT_FSTYPE" = "vfat" ]; then
     _btype="fat32"
     _btype="fat32"
 fi
 fi
 parted $FILENAME mkpart primary ${_btype} 2048s 256M
 parted $FILENAME mkpart primary ${_btype} 2048s 256M
-parted $FILENAME mkpart primary ${ROOT_FSTYPE} 256M 100%
+parted $FILENAME mkpart primary ext2 256M 100%
 parted $FILENAME toggle 1 boot
 parted $FILENAME toggle 1 boot
 LOOPDEV=$(losetup --show --find -P $FILENAME)
 LOOPDEV=$(losetup --show --find -P $FILENAME)
 mkfs.${BOOT_FSTYPE} ${LOOPDEV}p1 >/dev/null 2>&1
 mkfs.${BOOT_FSTYPE} ${LOOPDEV}p1 >/dev/null 2>&1