From 024ee0efd91431249e0eab21e6b7217f6f0a4f1d Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Thu, 7 Mar 2019 12:56:10 +0000 Subject: [PATCH 1/3] remove expert commands Note that there is not much actual code removed, but this commit only removes the exposure to the user. There is a big re-write incoming and is it not feasable to maintain "convenience" commands that are exposed to the users. The expert command paths are not tested in any automated fashion and the likely hood of them breaking is pretty high. We can always bring commands if there are requests from users. Note that that the "raw-disk-image-shrink-rootfs" expert command is promoted to a "General command" and is not removed. This has shown to provide value to our users. Changelog: Title Signed-off-by: Mirza Krak --- mender-convert | 64 -------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/mender-convert b/mender-convert index 359ebb0..cba315d 100755 --- a/mender-convert +++ b/mender-convert @@ -19,18 +19,8 @@ General commands: necessary files installed mender-disk-image-to-artifact - creates Mender artifact file from Mender image - -Expert commands: - raw-disk-image-shrink-rootfs - shrinks existing embedded raw disk image - raw-disk-image-create-partitions - converts raw disk image's - partition table to be compliant - with Mender partition layout - install-mender-to-mender-disk-image - installs Mender client related - files - install-bootloader-to-mender-disk-image - installs bootloader (U-Boot/GRUB) - related files Options: [-r|--raw-disk-image | -m|--mender-disk-image | -s|--data-part-size-mb | -d|--device-type | -p|--rootfs-partition-id | -n|--demo | -i|--demo-host-ip | @@ -95,8 +85,6 @@ Examples: Note: artifact name format is: release-_ -Examples for expert actions: - To shrink the existing embedded raw disk image: ./mender-convert raw-disk-image-shrink-rootfs @@ -104,37 +92,6 @@ Examples for expert actions: Output: Root filesystem size (sectors): 4521984 - To convert raw disk image's partition table to Mender layout: - - ./mender-convert raw-disk-image-create-partitions - --raw-disk-image - [--mender-disk-image ] - --artifact-name release-1_1.5.0 - --device-type - [--data-part-size-mb 128] - - Output: repartitioned (respectively to Mender layout) raw disk image - - To install Mender client related files: - - ./mender-convert install-mender-to-mender-disk-image - --mender-disk-image - --device-type - --artifact-name release-1_1.5.0 - --demo-host-ip 192.168.10.2 - --mender-client - - Output: Mender image with Mender client related files installed - - To install bootloader (U-Boot/GRUB) related files: - - ./mender-convert install-bootloader-to-mender-disk-image - --mender-disk-image - --device-type - --bootloader-toolchain arm-linux-gnueabihf - - Output: Mender image with appropriate bootloader (U-Boot/GRUB) installed - EOF } @@ -836,27 +793,6 @@ case "$1" in log "You can now convert the output raw disk image\n\t$raw_disk_image\ \nto a Mender disk image." ;; - raw-disk-image-create-partitions) - total=6 - do_raw_disk_image_create_partitions || rc=$? - [[ $rc -ne 0 ]] && { log "Check $build_log for details."; exit 1; } - log "A new Mender disk image with partition layout to support Mender has been successfully created!" - log "You can find the output Mender disk image at:\n\t${mender_disk_image}" - ;; - install-mender-to-mender-disk-image) - total=1 - do_install_mender_to_mender_disk_image || rc=$? - [[ $rc -ne 0 ]] && { log "Check $build_log for details."; exit 1; } - log "The Mender client has been successfully installed to the Mender disk image." - log "You can find the output Mender disk image at:\n\t${mender_disk_image}" - ;; - install-bootloader-to-mender-disk-image) - total=1 - do_install_bootloader_to_mender_disk_image || rc=$? - [[ $rc -ne 0 ]] && { log "Check $build_log for details."; exit 1; } - log "A bootloader configuration supporting dual A/B rootfs updates has been installed to the Mender disk image!" - log "You can find the output Mender disk image at:\n\t${mender_disk_image}" - ;; mender-disk-image-to-artifact) total=1 do_mender_disk_image_to_artifact || rc=$? From 0813da3b19b371a2c6dc8410a0203674ea817c01 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Thu, 7 Mar 2019 13:05:04 +0000 Subject: [PATCH 2/3] remove commented code Changelog: None Signed-off-by: Mirza Krak --- mender-convert | 3 --- 1 file changed, 3 deletions(-) diff --git a/mender-convert b/mender-convert index cba315d..416b9c3 100755 --- a/mender-convert +++ b/mender-convert @@ -648,9 +648,6 @@ do_from_raw_disk_image() { return 0 } -#read -s -p "Enter password for sudo: " sudoPW -#echo "" - PARAMS="" # Load necessary functions. From 1d433c189e0595b5fa1792bd48f7d31b040b60ff Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Thu, 7 Mar 2019 13:28:59 +0000 Subject: [PATCH 3/3] convert-functions: remove unused function Changelog: None Signed-off-by: Mirza Krak --- mender-convert-functions.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mender-convert-functions.sh b/mender-convert-functions.sh index 25479ce..0581f50 100755 --- a/mender-convert-functions.sh +++ b/mender-convert-functions.sh @@ -463,17 +463,6 @@ mender_image_size_to_total_storage_size() { return 0 } -# Takes following arguments: -# -# $1 - raw disk image -unmount_partitions() { - log "Check if device is mounted..." - is_mounted=`grep ${1} /proc/self/mounts | wc -l` - if [ ${is_mounted} -ne 0 ]; then - sudo umount ${1}?* - fi -} - # Takes following arguments: # # $1 - raw disk image path