From 62e04d5414f4b5bc6cf6b15c2b874efe42bd2f45 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Sun, 26 Mar 2017 20:59:14 +0200 Subject: [PATCH] version 0.2 --- README.md | 9 ++++----- VERSION | 2 +- addon/www/index.html | 2 +- resize_image.sh | 8 ++++---- rmupdate.tar.gz | Bin 0 -> 8718 bytes 5 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 rmupdate.tar.gz diff --git a/README.md b/README.md index e4c4542..84411a8 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ # RaspberryMatic addon to (auto-)update system -Do not use this addon in the current state! +This addon can be used to easily up- and downgrade the RaspberryMatic system to another version. ## Prerequisites -* Adapted partiton layout -* This addon depends on CUxD +* RaspMatic image with adjusted partition sizes ## Installation / configuration -* Download [adapted RaspberryMatic image](https://github.com/j-a-n/raspberrymatic-addon-rmupdate/raw/master/RaspberryMatic.zip) +* Download [adapted RaspberryMatic image](https://github.com/j-a-n/raspberrymatic-addon-rmupdate/raw/master/RaspberryMatic.adjusted.zip) +* Install adjusted RaspberryMatic image like described at [RaspberryMatic project](https://github.com/jens-maus/RaspberryMatic) * Download [addon package](https://github.com/j-a-n/raspberrymatic-addon-rmupdate/raw/master/rmupdate.tar.gz) * Install addon package on RaspberryMatic via system control - diff --git a/VERSION b/VERSION index 49d5957..3b04cfb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1 +0.2 diff --git a/addon/www/index.html b/addon/www/index.html index 2722980..c1cb663 100644 --- a/addon/www/index.html +++ b/addon/www/index.html @@ -200,7 +200,7 @@ along with this program. If not, see . rest("GET", "/is_system_upgradeable", null, function(upgradeable) { if (!upgradeable) { var message = 'Filesystems to small, system not upgradeable!
'; - message += 'Please download and install adapted RaspMatic image first.'; + message += 'Please download and install adjusted RaspMatic image from RaspMatic image first.'; display_message('error', message, 6000000); } }); diff --git a/resize_image.sh b/resize_image.sh index 62e89ff..b0a3531 100755 --- a/resize_image.sh +++ b/resize_image.sh @@ -1,8 +1,8 @@ #!/bin/bash -e LOOP_DEV=4 -BOOT_SIZE=$((50*1024*1024)) -ROOT_SIZE=$((1000*1024*1024)) +BOOT_SIZE=$((100*1024*1024)) +ROOT_SIZE=$((1900*1024*1024)) USR_LOCAL_SIZE=$((2*1024*1024)) @@ -12,7 +12,7 @@ if [[ $EUID -ne 0 ]]; then fi image_file="$1" -new_image_file="$1.resized" +new_image_file="${1/\.img/\.adjusted\.img}" echo "*** Creating new image file and partitions ***" dd if=/dev/zero of=$new_image_file bs=1M count=$((((${BOOT_SIZE}+${ROOT_SIZE}+${USR_LOCAL_SIZE})/1024/1024)+1)) @@ -49,7 +49,7 @@ losetup /dev/loop${LOOP_DEV} $new_image_file kpartx -a /dev/loop${LOOP_DEV} ln -s /dev/loop${LOOP_DEV} /dev/mapper/loop${LOOP_DEV}p -fsck.vfat -a /dev/mapper/loop${LOOP_DEV}p1 +#fsck.vfat -a /dev/mapper/loop${LOOP_DEV}p1 fatresize --size $BOOT_SIZE /dev/mapper/loop${LOOP_DEV}p1 fsck.ext4 -f -y /dev/mapper/loop${LOOP_DEV}p2 resize2fs /dev/mapper/loop${LOOP_DEV}p2 diff --git a/rmupdate.tar.gz b/rmupdate.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a8340be6855ffd233d46bc0d00291ab6abbf72c2 GIT binary patch literal 8718 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