Installing update on a separate partiton

addon/lib/rmupdate.tcl

@@ -20,8 +20,8 @@ namespace eval rmupdate {
 	variable release_url "https://github.com/jens-maus/RaspberryMatic/releases"
 	variable addon_dir "/usr/local/addons/rmupdate"
 	variable img_dir "/usr/local/addons/rmupdate/var/img"
-	variable mnt_cur "/usr/local/addons/rmupdate/var/mnt_cur"
+	variable mnt_sys "/usr/local/addons/rmupdate/var/mnt_sys"
-	variable mnt_new "/usr/local/addons/rmupdate/var/mnt_new"
+	variable mnt_img "/usr/local/addons/rmupdate/var/mnt_img"
 	variable sys_dev "/dev/mmcblk0"
 	variable loop_dev "/dev/loop7"
 	variable install_log "/usr/local/addons/rmupdate/var/install.log"
@@ -115,28 +115,21 @@ proc ::rmupdate::get_partion_start_and_size {device partition} {
 			return [list $start $size]
 		}
 	}
-	return [list -1 -1]
+	error "Failed to get partition start and size of device ${device}, partition ${partition}."
 }
 
 proc ::rmupdate::is_system_upgradeable {} {
-	set ret [get_filesystem_size_and_usage "/"]
+	variable sys_dev
-	set size [lindex $ret 0]
+	if { [rmupdate::get_filesystem_label "${sys_dev}p2"] != "rootfs1" } {
-	set used [lindex $ret 1]
+		return 0
-	if { [expr {$used*1.5}] > $size && [expr {$used+50*1024*1024}] >= $size } {
+	}
+	if { [rmupdate::get_filesystem_label "${sys_dev}p3"] != "rootfs2" } {
 		return 0
 	}
 	return 1
 }
 
-proc ::rmupdate::get_part_id {device} {
+proc ::rmupdate::get_part_uuid {device} {
-	#set data [exec blkid $device]
-	#foreach d [split $data "\n"] {
-	#	# recent busybox version needed
-	#	regexp {PARTUUID="([^"]+)"} $d match partuuid
-	#	if { [info exists partuuid] } {
-	#		return $partuuid
-	#	}
-	#}
 	foreach f [glob /dev/disk/by-partuuid/*] {
 		set d ""
 		catch {
@@ -146,7 +139,18 @@ proc ::rmupdate::get_part_id {device} {
 			return [file tail $f]
 		}
 	}
-	return ""
+	error "Failed to get partition uuid of device ${device}."
+}
+
+proc ::rmupdate::get_filesystem_label {device} {
+	set data [exec /sbin/blkid $device]
+	foreach d [split $data "\n"] {
+		regexp {LABEL="([^"]+)"} $d match lab
+		if { [info exists lab] } {
+			return $lab
+		}
+	}
+	error "Failed to get filesystem label of device ${device}."
 }
 
 proc ::rmupdate::update_cmdline {cmdline root} {
@@ -161,6 +165,20 @@ proc ::rmupdate::update_cmdline {cmdline root} {
 	close $fd
 }
 
+proc ::rmupdate::get_current_root_partition {} {
+	set cmdline "/boot/cmdline.txt"
+	set fd [open $cmdline r]
+	set data [read $fd]
+	close $fd
+	foreach d [split $data "\n"] {
+		regexp {root=PARTUUID=[a-f0-9]+-([0-9]+)} $d match partition
+		if { [info exists partition] } {
+			return [expr {0 + $partition}]
+		}
+	}
+	return 2
+}
+
 proc ::rmupdate::update_fstab {fstab {boot ""} {root ""} {user ""}} {
 	set ndata ""
 	set fd [open $fstab r]
@@ -190,7 +208,6 @@ proc ::rmupdate::update_fstab {fstab {boot ""} {root ""} {user ""}} {
 
 proc ::rmupdate::mount_image_partition {image partition mountpoint} {
 	variable loop_dev
-	variable sys_dev
 	
 	write_log "Mounting parition ${partition} of image ${image}."
 
@@ -204,21 +221,38 @@ proc ::rmupdate::mount_image_partition {image partition mountpoint} {
 	exec /bin/mount $loop_dev -o ro "${mountpoint}"
 }
 
-proc ::rmupdate::mount_system_partition {partition_or_filesystem mountpoint} {
+proc ::rmupdate::mount_system_partition {partition mountpoint} {
-	if {$partition_or_filesystem == 1} {
+	variable sys_dev
-		set partition_or_filesystem "/boot"
+	set remount 1
-	} elseif {$partition_or_filesystem == 2} {
+	set root_partition [get_current_root_partition]
-		set partition_or_filesystem "/"
+	
-	} elseif {$partition_or_filesystem == 3} {
+	if {$partition == 1} {
-		set partition_or_filesystem "/usr/local"
+		set partition "/boot"
+	} elseif {$partition == 2 || $partition == 3} {
+		if {$partition == $root_partition} {
+			set partition "/"
+		} else {
+			set partition "${sys_dev}p${partition}"
+			set remount 0
+		}
+	} elseif {$partition == 4} {
+		set partition "/usr/local"
 	}
 	
-	write_log "Remounting filesystem ${partition_or_filesystem} (rw)."
+	if {$remount} {
-	
+		write_log "Remounting filesystem ${partition} (rw)."
+	} else {
+		write_log "Mounting device ${partition} (rw)."
+	}
 	file mkdir $mountpoint
 	catch {exec /bin/umount "${mountpoint}"}
-	exec /bin/mount -o bind $partition_or_filesystem "${mountpoint}"
+	
-	exec /bin/mount -o remount,rw "${mountpoint}"
+	if {$remount} {
+		exec /bin/mount -o bind $partition "${mountpoint}"
+		exec /bin/mount -o remount,rw "${mountpoint}"
+	} else {
+		exec /bin/mount -o rw $partition "${mountpoint}"
+	}
 }
 
 proc ::rmupdate::umount {device_or_mountpoint} {
@@ -239,29 +273,29 @@ proc ::rmupdate::get_filesystem_size_and_usage {device_or_mountpoint} {
 }
 
 proc ::rmupdate::check_sizes {image} {
-	variable mnt_new
+	variable mnt_img
-	variable mnt_cur
+	variable mnt_sys
 	
 	write_log "Checking size of filesystems."
 	
-	file mkdir $mnt_new
+	file mkdir $mnt_img
-	file mkdir $mnt_cur
+	file mkdir $mnt_sys
 	
 	foreach partition [list 1 2] {
-		mount_image_partition $image $partition $mnt_new
+		mount_image_partition $image $partition $mnt_img
-		mount_system_partition $partition $mnt_cur
+		mount_system_partition $partition $mnt_sys
 		
-		set su_new [get_filesystem_size_and_usage $mnt_new]
+		set su_new [get_filesystem_size_and_usage $mnt_img]
 		set new_used [lindex $su_new 1]
-		set su_cur [get_filesystem_size_and_usage $mnt_cur]
+		set su_cur [get_filesystem_size_and_usage $mnt_sys]
 		set cur_size [lindex $su_cur 0]
 		
 		write_log "Current filesystem (${partition}) size: ${cur_size}, new filesystem used bytes: ${new_used}."
 		
-		umount $mnt_new
+		umount $mnt_img
-		umount $mnt_cur
+		umount $mnt_sys
 		
-		if { [expr {$new_used*1.5}] > $cur_size && [expr {$new_used+50*1024*1024}] >= $cur_size } {
+		if { [expr {$new_used*1.05}] > $cur_size && [expr {$new_used+50*1024*1024}] >= $cur_size } {
 			error "Current filesystem of partition $partition (${cur_size} bytes) not big enough (new usage: ${new_used} bytes)."
 		}
 	}
@@ -269,10 +303,12 @@ proc ::rmupdate::check_sizes {image} {
 }
 
 proc ::rmupdate::update_filesystems {image {dryrun 0}} {
-	variable mnt_new
+	variable mnt_img
-	variable mnt_cur
+	variable mnt_sys
 	variable sys_dev
 	
+	set root_partition [get_current_root_partition]
+	
 	set extra_args ""
 	if {$dryrun != 0} {
 		set extra_args "--dry-run"
@@ -280,42 +316,37 @@ proc ::rmupdate::update_filesystems {image {dryrun 0}} {
 	
 	write_log "Updating filesystems."
 	
-	file mkdir $mnt_new
+	file mkdir $mnt_img
-	file mkdir $mnt_cur
+	file mkdir $mnt_sys
 	
-	foreach partition [list 1 2] {
+	foreach img_partition [list 2 1] {
-		write_log "Updating partition ${partition}."
+		set sys_partition $img_partition
-		
+		if {$img_partition == 2 && $root_partition == 2} {
-		mount_image_partition $image $partition $mnt_new
+			set sys_partition 3
-		mount_system_partition $partition $mnt_cur
-		
-		write_log "Rsyncing filesystem of partition ${partition}."
-		if {$partition == 2} {
-			exec rsync ${extra_args} --progress --archive --delete --exclude=/lib "${mnt_new}/" "${mnt_cur}"
-			exec rsync ${extra_args} --progress --archive --delete "${mnt_new}/lib/" "${mnt_cur}/lib.rmupdate"
-		} else {
-			exec rsync ${extra_args} --progress --archive --delete "${mnt_new}/" "${mnt_cur}"
 		}
+		write_log "Updating system partition ${sys_partition}."
+		
+		mount_image_partition $image $img_partition $mnt_img
+		mount_system_partition $sys_partition $mnt_sys
+		
+		write_log "Rsyncing filesystem of partition ${sys_partition}."
+		exec rsync ${extra_args} --progress --archive --delete "${mnt_img}/" "${mnt_sys}"
 		write_log "Rsync finished."
 		
-		if {$partition == 1} {
+		if {$img_partition == 1} {
 			write_log "Update cmdline."
 			if {$dryrun == 0} {
-				update_cmdline "${mnt_cur}/cmdline.txt" "${sys_dev}p2"
+				set new_root_partition 2
-				#set partid [get_part_id "${sys_dev}p2"]
+				if {$root_partition == 2} {
-				#if { $partid != "" } {
+					set new_root_partition 3
-				#	set_root_in_cmdline "${mnt_cur}/cmdline.txt" "PARTUUID=${partid}"
+				}
-				#}
+				set part_uuid [rmupdate::get_part_uuid "${sys_dev}p${new_root_partition}"]
-			}
+				update_cmdline "${mnt_sys}/cmdline.txt" "PARTUUID=${part_uuid}"
-		} elseif {$partition == 2} {
-			write_log "Update fstab."
-			if {$dryrun == 0} {
-				update_fstab "${mnt_cur}/etc/fstab" "${sys_dev}p1" "/dev/root" "${sys_dev}p3"
 			}
 		}
 		
-		umount $mnt_new
+		umount $mnt_img
-		umount $mnt_cur
+		umount $mnt_sys
 	}
 }
 
@@ -505,6 +536,9 @@ proc ::rmupdate::install_firmware_version {version {reboot 1} {dryrun 0}} {
 	if {[rmupdate::install_process_running]} {
 		error "Another install process is running."
 	}
+	if {! [rmupdate::is_system_upgradeable]} {
+		error "System not upgradeable."
+	}
 	
 	variable install_lock
 	variable log_file
@@ -534,37 +568,16 @@ proc ::rmupdate::install_firmware_version {version {reboot 1} {dryrun 0}} {
 	
 	file delete $install_lock
 	
-	if {$reboot} {
+	if {$reboot && !$dryrun} {
-		if { [file exist /lib.rmupdate] } {
+		write_log "Rebooting system."
-			write_log "Replacing /lib and rebooting system."
-		} else {
-			write_log "Rebooting system."
-		}
 	}
+	
 	# Write success marker for web interface
 	write_log "INSTALL_FIRMWARE_SUCCESS"
-	after 3000
+	after 5000
 	
-	if {$reboot} {
+	if {$reboot && !$dryrun} {
-		if { [file exist /lib.rmupdate] } {
+		exec /sbin/reboot -f
-			exec mount -o remount,rw /
-			exec rsync --archive --delete /lib.rmupdate/ /lib
-			
-			set fd [open /proc/sys/kernel/sysrq "a"]
-			puts $fd "1"
-			close $fd
-			set fd [open /proc/sysrq-trigger "a"]
-			puts $fd "s"
-			close $fd
-			set fd [open /proc/sysrq-trigger "a"]
-			puts $fd "u"
-			close $fd
-			set fd [open /proc/sysrq-trigger "a"]
-			puts $fd "b"
-			close $fd
-		} else {
-			exec /bin/sh -c "sleep 5; reboot -f " &
-		}
 	}
 }
 
@@ -577,9 +590,9 @@ proc ::rmupdate::install_firmware_version {version {reboot 1} {dryrun 0}} {
 #puts [rmupdate::get_latest_firmware_download_url]
 #rmupdate::check_sizes "/usr/local/addons/raspmatic-update/tmp/RaspberryMatic-2.27.7.20170316.img"
 #set res [rmupdate::get_partion_start_and_size "/dev/mmcblk0" 1]
-#rmupdate::mount_image_partition "/usr/local/addons/raspmatic-update/tmp/RaspberryMatic-2.27.7.20170316.img" 1 $rmupdate::mnt_new
+#rmupdate::mount_image_partition "/usr/local/addons/raspmatic-update/tmp/RaspberryMatic-2.27.7.20170316.img" 1 $rmupdate::mnt_img
-#rmupdate::umount $rmupdate::mnt_new
+#rmupdate::umount $rmupdate::mnt_img
-#rmupdate::mount_system_partition "/boot" $rmupdate::mnt_cur
+#rmupdate::mount_system_partition "/boot" $rmupdate::mnt_sys
-#rmupdate::umount $rmupdate::mnt_cur
+#rmupdate::umount $rmupdate::mnt_sys
 #puts [rmupdate::get_rpi_version]
-
+#puts [rmupdate::get_part_uuid "/dev/mmcblk0p3"]

addon/www/index.html

@@ -132,12 +132,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			clear_message();
 			rest("POST", "/start_install_firmware", JSON.stringify({"version":version, "reboot":reboot, "dryrun":dryrun}),
 				function(data) {
+					// We are not expecting a response
+					console.log("Firmware installation finished.")
 					installation_finished();
-					if (!reboot) {
-						get_firmware_info();
-					}
 				},
 				function(xhr, ajaxOptions, thrownError) {
+					console.error("Firmware installation error.")
 					$('[data-install-version="' + installation_running + '"]').removeClass('loading');
 					//$('#modal-log').modal('hide');
 					if (installation_running) {
@@ -197,7 +197,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 				$("#firmware-summary").empty();
 				$("#firmware-summary").append(
 					$('<div class="sub header">').html('Current installed version: <span style="color:'+ color +'">' + current_firmware + '</span>'),
-					$('<div class="sub header">').html('Latest avaialable version: ' + latest_firmware)
+					$('<div class="sub header">').html('Latest available version: ' + latest_firmware)
 				);
 				if (current_firmware != latest_firmware) {
 					$("#firmware-summary").append(
@@ -207,17 +207,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			});
 		}
 		
+		function get_system_info() {
+			rest("GET", "/get_system_info", null, function(data) {
+				$("#system-info").empty();
+				$("#system-info").append(
+					$('<div class="sub header">').html('Current root partition: ' + data.root_partition)
+				);
+			});
+		}
+		
 		$(document).ready(function() {
 			rest("GET", "/version", null, function(version) {
 				document.title = document.title + " " + version;
 			});
 			rest("GET", "/is_system_upgradeable", null, function(upgradeable) {
 				if (!upgradeable) {
-					var message = 'Filesystems to small, system not upgradeable!<br />';
+					var message = 'System not upgradeable or filesystem to small!<br />';
 					message += 'Please download and install adjusted RaspMatic image from <a href="https://github.com/j-a-n/raspberrymatic-addon-rmupdate">RaspMatic image</a> first.';
 					display_message('error', message, 6000000);
 				}
 			});
+			get_system_info();
 			get_firmware_info();
 		});
 	</script>
@@ -227,6 +237,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		<h1 class="ui header">RaspberryMatic Update</h1>
 		<div id="message" class="ui message hidden">
 		</div>
+		<h2 class="ui dividing header">System info</h2>
+		<div class="content" id="system-info">
+		</div>
 		<h2 class="ui dividing header">Firmwares</h2>
 		<div class="content" id="firmware-summary">
 		</div>
@@ -247,7 +260,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<label>Perform a trial run with no changes made</label>
 		</div>
 		<br />
-		<div style="visibility:hidden" class="ui checkbox">
+		<div class="ui checkbox">
 			<input id="reboot-after-install" type="checkbox" checked="checked">
 			<label>Reboot system after installation</label>
 		</div>

addon/www/rest.cgi

@@ -47,6 +47,9 @@ proc process {} {
 			return "\"[rmupdate::version]\""
 		} elseif {[lindex $path 1] == "get_firmware_info"} {
 			return [rmupdate::get_firmware_info]
+		} elseif {[lindex $path 1] == "get_system_info"} {
+			set root_partition [rmupdate::get_current_root_partition]
+			return "\{\"root_partition\":${root_partition}\}"
 		} elseif {[lindex $path 1] == "start_install_firmware"} {
 			regexp {\"version\"\s*:\s*\"([\d\.]+)\"} $data match version
 			regexp {\"reboot\"\s*:\s*(true|false)} $data match reboot
@@ -75,8 +78,7 @@ proc process {} {
 		} elseif {[lindex $path 1] == "delete_firmware_image"} {
 			regexp {\"version\"\s*:\s*\"([\d\.]+)\"} $data match version
 			if { [info exists version] && $version != "" } {
-				set res [rmupdate::delete_firmware_image $version]
+				return "\"[rmupdate::delete_firmware_image $version]\""
-				return "\"${res}\""
 			} else {
 				error "Invalid version: ${data}"
 			}

adjust_image.sh

@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
-LOOP_DEV=4
+LOOP_DEV=7
 BOOT_SIZE=$((100*1024*1024))
-ROOT_SIZE=$((1900*1024*1024))
+ROOT_SIZE=$((1000*1024*1024))
 USR_LOCAL_SIZE=$((2*1024*1024))
 
 
@@ -23,13 +23,14 @@ echo "image: ${image_file}"
 echo "adjusted image: ${new_image_file}"
 
 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))
+dd if=/dev/zero of=$new_image_file bs=1M count=$((((${BOOT_SIZE}+${ROOT_SIZE}+${ROOT_SIZE}+${USR_LOCAL_SIZE})/1024/1024)+1))
 parted --script $new_image_file \
 	mklabel msdos \
-	mkpart primary fat16 512B ${BOOT_SIZE}B \
+	mkpart primary fat32 512B ${BOOT_SIZE}B \
 	set 1 boot on \
 	mkpart primary ext4 $((512+${BOOT_SIZE}))B $((${BOOT_SIZE}+${ROOT_SIZE}))B \
-	mkpart primary ext4 $((512+${BOOT_SIZE}+${ROOT_SIZE}))B 100%
+	mkpart primary ext4 $((512+${BOOT_SIZE}+${ROOT_SIZE}))B $((${BOOT_SIZE}+${ROOT_SIZE}+${ROOT_SIZE}))B \
+	mkpart primary ext4 $((512+${BOOT_SIZE}+${ROOT_SIZE}+${ROOT_SIZE}))B 100%
 
 echo "*** Copying original partitons ***"
 oIFS="$IFS"
@@ -44,11 +45,11 @@ for line in $(parted $image_file unit B print | grep primary); do
 	seek=0
 	[ "$num" = "1" ] && seek=$start
 	[ "$num" = "2" ] && seek=$(((512+${BOOT_SIZE})/512))
-	[ "$num" = "3" ] && seek=$(((512+${BOOT_SIZE}+${ROOT_SIZE})/512))
+	[ "$num" = "3" ] && seek=$(((512+${BOOT_SIZE}+${ROOT_SIZE}+${ROOT_SIZE})/512))
 	dd if=$image_file of=$new_image_file bs=512 skip=$start count=$size seek=$seek conv=notrunc
 done
 
-echo "*** Resizing filesystems ***"
+echo "*** Resizing / creating filesystems ***"
 rm /dev/mapper/loop${LOOP_DEV}p 2>/dev/null || true
 kpartx -d /dev/loop${LOOP_DEV} 2>/dev/null || true
 losetup -d /dev/loop${LOOP_DEV} 2>/dev/null || true
@@ -61,12 +62,21 @@ ln -s /dev/loop${LOOP_DEV} /dev/mapper/loop${LOOP_DEV}p
 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
-fsck.ext4 -f -y /dev/mapper/loop${LOOP_DEV}p3
+tune2fs -L rootfs1 /dev/mapper/loop${LOOP_DEV}p2
-resize2fs /dev/mapper/loop${LOOP_DEV}p3
+mkfs.ext4 -L rootfs2 /dev/mapper/loop${LOOP_DEV}p3
+fsck.ext4 -f -y /dev/mapper/loop${LOOP_DEV}p4
+resize2fs /dev/mapper/loop${LOOP_DEV}p4
+
+partuuid=$(blkid -s PARTUUID -o value /dev/mapper/loop${LOOP_DEV}p2)
+mkdir /tmp/rmupdate.mnt
+mount /dev/mapper/loop${LOOP_DEV}p1 /tmp/rmupdate.mnt
+sed -i -r s"/root=\S+/root=PARTUUID=${partuuid}/" /tmp/rmupdate.mnt/cmdline.txt
+umount /tmp/rmupdate.mnt
+rmdir /tmp/rmupdate.mnt
 
 rm /dev/mapper/loop${LOOP_DEV}p
 kpartx -d /dev/loop${LOOP_DEV}
 losetup -d /dev/loop${LOOP_DEV}
 
-echo "*** Resized image successfully created ***"
+echo "*** Adjusted image successfully created ***"
 

rmupdate

@@ -7,12 +7,7 @@ RCD_DIR=${CONFIG_DIR}/rc.d
 
 case "$1" in
 	""|start)
-		if [ -e /lib.rmupdate ]; then
+		echo "Nothing to do."
-			mount -o remount,rw /
-			rm -r /lib.rmupdate
-			mount -o remount,ro /
-		fi
-		echo "Done."
 	;;
 	
 	stop|restart)