Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch/rocko3 #75

Closed
wants to merge 22 commits into from
Closed

Patch/rocko3 #75

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1c8da62
example: Prepare for installing npms manually
jan-kiszka Dec 10, 2017
fcad25e
example: Provide own linux-libc-headers_4.4 recipe
jan-kiszka Dec 10, 2017
1b3f5a8
example: Avoid rsync dependency in galileo-target installation
jan-kiszka Dec 10, 2017
718b5cf
bsp: Port to rocko
jan-kiszka Dec 6, 2017
6b9dc3d
example: Port to rocko
jan-kiszka Dec 6, 2017
e7c44d9
example: Rework setledcolor command line interface
jan-kiszka Dec 6, 2017
8823915
bsp: Remove obsolete MACHINE_ESSENTIAL_EXTRA_RDEPENDS override
jan-kiszka Dec 11, 2017
859753e
bsp: Enable support for QEMU emulation
jan-kiszka Dec 11, 2017
870425a
Add meta-efibootguard to kas file
Aug 24, 2017
8c00033
meta-iot2000-bsp: Change EFI_PROVIDER
Aug 24, 2017
9bbf171
Add gptfdisk for wic
Dec 7, 2017
59ef398
Change partition layout and bootloader params
Dec 7, 2017
3c9f280
Use official meta-swupdate layer
Dec 7, 2017
cf26973
wic: Export needed bitbake variables to wic
Jan 3, 2018
872ca86
Add native bg_setenv to the image dependencies
Dec 7, 2017
1abad60
Add efibootguard tools and swupdate to example image
Jan 8, 2018
63c42f2
Add ext4.gz to IMAGE_FSTYPES for swupdate
Jan 9, 2018
6947b47
Add update-image recipe and sw-description
Jan 8, 2018
b649176
Add kas yml for update image generation
Jan 16, 2018
1038f13
Be sure do_bootimg ends before do_image_wic starts
Jan 17, 2018
b83d149
Improve expandfs script
Jan 17, 2018
4b90604
Add some information about swupdate
Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 54 additions & 10 deletions meta-iot2000-example/recipes-example/iot2000setup/files/expandfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,74 @@

set -eu

PART_NUMBER=3
THIS_SCRIPT="$(basename $0)"

log () {
echo ${THIS_SCRIPT}: $1 > /dev/kmsg
}

disable () {
log "Deactivating this automatic resizer"
update-rc.d -f expandfs.sh remove
}

case $(mount | grep "on / ") in
/dev/mmcblk0*)
ROOT_DEVICE="/dev/mmcblk0"
ROOT_PARTITION="/dev/mmcblk0p$PART_NUMBER"
EXPAND_PARTITION="/dev/mmcblk0p"
;;
/dev/sda*)
ROOT_DEVICE="/dev/sda"
ROOT_PARTITION="/dev/sda$PART_NUMBER"
EXPAND_PARTITION="/dev/sda"
;;
*)
echo "Cannot determine boot device."
log "Cannot determine root device."
disable
exit 1
;;
esac

START_BLOCK=$(parted $ROOT_DEVICE -ms unit s p | grep "^$PART_NUMBER" | cut -f 2 -d: | sed "s/s$//")
log "Fixing backup GPT position"
parted ${ROOT_DEVICE} print Fix
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left over debug print? But "Fix" is not a known parameter to parted.


parted -ms $ROOT_DEVICE rm $PART_NUMBER
LAST_PART="$(parted ${ROOT_DEVICE} -ms unit s p | tail -n 1 | cut -d ':' -f 1)"
if [ "x${LAST_PART}" == "x" ]
then
log "Cannot find last partition of root device."
disable
exit 1
fi

parted -ms $ROOT_DEVICE unit s -- mkpart primary ext3 $START_BLOCK -1
EXPAND_PARTITION="${EXPAND_PARTITION}${LAST_PART}"

MAXSIZE="$(parted ${ROOT_DEVICE} -s unit MB print list | grep Disk | cut -d' ' -f 3 | tr -d MB)"
if [ "x${MAXSIZE}" == "x" ]
then
log "Error obtaining maximum partition size"
disable
exit 1
fi

partprobe $ROOT_DEVICE
resize2fs $ROOT_PARTITION
log "Resizing ${EXPAND_PARTITION} to maximum"
parted ${ROOT_DEVICE} -s resizepart ${LAST_PART} ${MAXSIZE}M
res=$?
if [ $res -ne 0 ]
then
log "Error resizing partition"
disable
exit 1
fi

partprobe ${ROOT_DEVICE}

log "Resizing file system on ${EXPAND_PARTITION}"
resize2fs ${EXPAND_PARTITION}
Copy link
Collaborator

@jan-kiszka jan-kiszka Mar 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For whatever reason, this just refused to work:

rc: Resizing /dev/mmcblk0p7 to maximum
rc: Resizing file system on /dev/mmcblk0p7
resize2fs 1.43.5 (04-Aug-2017)
Please run 'e2fsck -f /dev/mmcblk0p7' first.

Adding that check here seems reasonable.

res=$?
if [ $res -ne 0 ]
then
log "Error resizing file system"
disable
exit 1
fi

update-rc.d -f expandfs.sh remove
disable
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, not a regression: parted also gets stuck on lacking entropy. Possibly because it pulls in some uuid lib which first of all wants to initialized some randomness.

I'm checking if we can avoid that. Alternatively, we could send the whole thing into background so that the first boot is not delayed. At least we need to think about the watchdog in case we no longer start it prematurely during early boot.