@@ -244,10 +244,10 @@ cat <<EOF >> $root_mnt/$BL_CONF
244
244
default main
245
245
246
246
label main
247
- kernel /$image_dir /boot/vmlinuz-5.10.0-18-2-arm64
248
- initrd /$image_dir /boot/initrd.img-5.10.0-18-2-arm64
249
- devicetree /$image_dir /boot/elba-asic-psci.dtb
250
- append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir /fs.squashfs
247
+ kernel /$image_dir /boot/vmlinuz-5.10.0-18-2-arm64
248
+ initrd /$image_dir /boot/initrd.img-5.10.0-18-2-arm64
249
+ devicetree /$image_dir /boot/elba-asic-psci.dtb
250
+ append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir /fs.squashfs
251
251
}
252
252
EOF
253
253
}
@@ -257,19 +257,19 @@ install_root_filesystem()
257
257
echo " ==> Installing root filesystem"
258
258
259
259
mount /dev/mmcblk0p$root_pn $root_mnt
260
- mkdir -p $root_mnt /$image_dir
260
+ mkdir -p $root_mnt /$image_dir
261
261
262
262
# Decompress the file for the file system directly to the partition
263
- if [ x" $docker_inram " = x" on" ]; then
263
+ if [ x" $docker_inram " = x" on" ]; then
264
264
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
265
265
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x " platform.tar.gz" -d $root_mnt /$image_dir
266
- else
266
+ else
267
267
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x " $FILESYSTEM_DOCKERFS " " platform.tar.gz" -d $root_mnt /$image_dir
268
268
269
269
TAR_EXTRA_OPTION=" --numeric-owner"
270
270
mkdir -p $root_mnt /$image_dir /$DOCKERFS_DIR
271
271
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -op - " $FILESYSTEM_DOCKERFS " | tar xz $TAR_EXTRA_OPTION -f - -C $root_mnt /$image_dir /$DOCKERFS_DIR
272
- fi
272
+ fi
273
273
274
274
create_bootloader_conf
275
275
0 commit comments