| @@ -102,13 +102,7 @@ if [ "$(id -u)" -ne 0 ]; then · 101 unmodified lines |
| 102 | 102 | die "need root perms to continue, exiting." |
| 103 | 103 | fi |
| 104 | 104 | |
| 105 | | −IMGSIZE="$2" |
| 106 | | −if [ -z "$IMGSIZE" ]; then |
| 107 | | − IMGSIZE="2G" |
| 108 | | −else |
| 109 | | − IMGSIZE="${2}G" |
| 110 | | −fi |
| 111 | | − |
| 105 | +: ${IMGSIZE:=2G} |
| 112 | 106 | : ${BOOT_FSTYPE:=vfat} |
| 113 | 107 | : ${BOOT_FSSIZE:=64M} |
| 114 | 108 | : ${ROOT_FSTYPE:=ext4} |
| @@ -143,7 +137,7 @@ info_msg "Creating disk image partitions/filesystems ..." · 28 unmodified lines |
| 143 | 137 | parted $FILENAME mktable msdos |
| 144 | 138 | if [ "$BOOT_FSTYPE" = "vfat" ]; then |
| 145 | 139 | _btype="fat32" |
| 146 | | − _args="-I" |
| 140 | + _args="-I -F16" |
| 147 | 141 | fi |
| 148 | 142 | parted $FILENAME mkpart primary ${_btype} 4096s ${BOOT_FSSIZE} |
| 149 | 143 | parted $FILENAME mkpart primary ext2 ${BOOT_FSSIZE} 100% |
| @@ -163,12 +157,19 @@ mkdir -p ${ROOTFSDIR}/boot · 13 unmodified lines |
| 163 | 157 | mount ${LOOPDEV}p1 ${ROOTFSDIR}/boot |
| 164 | 158 | |
| 165 | 159 | info_msg "Unpacking rootfs tarball ..." |
| 160 | +if [ "$PLATFORM" = "beaglebone" ]; then |
| 161 | + fstab_args=",noauto" |
| 162 | + tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR ./boot/MLO |
| 163 | + tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR ./boot/u-boot.img |
| 164 | + touch $ROOTFSDIR/boot/uEnv.txt |
| 165 | + umount $ROOTFSDIR/boot |
| 166 | +fi |
| 166 | 167 | tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR |
| 167 | 168 | |
| 168 | 169 | BOOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p1) |
| 169 | 170 | ROOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p2) |
| 170 | 171 | echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 1" >> ${ROOTFSDIR}/etc/fstab |
| 171 | | −echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults 0 2" >> ${ROOTFSDIR}/etc/fstab |
| 172 | +echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> ${ROOTFSDIR}/etc/fstab |
| 172 | 173 | |
| 173 | 174 | if [ -s ${ROOTFSDIR}/boot/cmdline.txt ]; then |
| 174 | 175 | sed -e "s,rootfstype=ext4,rootfstype=${ROOT_FSTYPE}," -i ${ROOTFSDIR}/boot/cmdline.txt |
| @@ -183,7 +184,7 @@ elif [ "$PLATFORM" = "odroid-u2" ]; then · 8 unmodified lines |
| 183 | 184 | dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1 |
| 184 | 185 | fi |
| 185 | 186 | |
| 186 | | −umount ${ROOTFSDIR}/boot |
| 187 | +mountpoint -q ${ROOTFSDIR}/boot || umount ${ROOTFSDIR}/boot |
| 187 | 188 | umount $ROOTFSDIR |
| 188 | 189 | partx -d $LOOPDEV |
| 189 | 190 | losetup -d $LOOPDEV |