DistriLab/clic-rpi-image
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into arm64

Browse source
This commit is contained in:
Serge Schneider 2021-09-01 11:10:57 +01:00
commit 600f7c1fa4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
imagetool.sh
View file

@ -103,10 +103,12 @@ if [ "${UMOUNT}" = "1" ] && [ -z "${MOUNTPOINT}" ]; then
fi fi
export NBD_DEV="${NBD_DEV:-/dev/nbd1}" export NBD_DEV="${NBD_DEV:-/dev/nbd1}"
export MAP_BOOT_DEV=/dev/mapper/nbd1p1
export MAP_ROOT_DEV=/dev/mapper/nbd1p2
source scripts/qcow2_handling source scripts/qcow2_handling
if [ "${MOUNT}" = "1" ]; then if [ "${MOUNT}" = "1" ]; then
mount_qimage "${MOUNTPOINT}" "${IMAGE}" mount_qimage "${IMAGE}" "${MOUNTPOINT}"
elif [ "${UMOUNT}" = "1" ]; then elif [ "${UMOUNT}" = "1" ]; then
umount_qimage "${MOUNTPOINT}" umount_qimage "${MOUNTPOINT}"
fi fi

2
stage1/00-boot-files/files/cmdline.txt
View file

@ -1 +1 @@
console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait