qubes.ResizeDisk: handle dmroot being a symlink
In non-template-based-VMs it can be just a symlink (depending on initramfs version).
This commit is contained in:
		
							parent
							
								
									6bf395022a
								
							
						
					
					
						commit
						a59ac1b4f9
					
				@ -13,15 +13,17 @@ case $disk_name in
 | 
				
			|||||||
    root)
 | 
					    root)
 | 
				
			||||||
        # force some read to refresh device size
 | 
					        # force some read to refresh device size
 | 
				
			||||||
        head /dev/xvda > /dev/null
 | 
					        head /dev/xvda > /dev/null
 | 
				
			||||||
        new_size=$(cat /sys/block/xvda/size)
 | 
					        if [ "$(stat -Lc %t /dev/mapper/dmroot)" != "ca" ]; then
 | 
				
			||||||
        ro=$(/sys/block/xvda/ro)
 | 
					            new_size=$(cat /sys/block/xvda/size)
 | 
				
			||||||
        if [ "$ro" -eq 1 ]; then
 | 
					            ro=$(/sys/block/xvda/ro)
 | 
				
			||||||
            new_table="0 $new_size snapshot /dev/xvda /dev/xvdc2 N 16"
 | 
					            if [ "$ro" -eq 1 ]; then
 | 
				
			||||||
        else
 | 
					                new_table="0 $new_size snapshot /dev/xvda /dev/xvdc2 N 16"
 | 
				
			||||||
            new_table="0 $new_size linear /dev/xvda 0"
 | 
					            else
 | 
				
			||||||
 | 
					                new_table="0 $new_size linear /dev/xvda 0"
 | 
				
			||||||
 | 
					            fi
 | 
				
			||||||
 | 
					            dmsetup load dmroot --table "$new_table"
 | 
				
			||||||
 | 
					            dmsetup resume dmroot
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
        dmsetup load dmroot --table "$new_table"
 | 
					 | 
				
			||||||
        dmsetup resume dmroot
 | 
					 | 
				
			||||||
        resize2fs /dev/mapper/dmroot
 | 
					        resize2fs /dev/mapper/dmroot
 | 
				
			||||||
        ;;
 | 
					        ;;
 | 
				
			||||||
    *)
 | 
					    *)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user