Re: [Tails-dev] [review'n'merge:1.1] revisiting bugfix/7345…

Delete this message

Reply to this message
Author: anonym
Date:  
To: The Tails public development discussion list
Subject: Re: [Tails-dev] [review'n'merge:1.1] revisiting bugfix/7345-upgrade-from-iso-from-1.0-to-1.1 [Was: [review'n'merge:1.1] bugfix/7443-persistent-files-permission]
01/07/14 19:33, anonym wrote:
> 01/07/14 19:14, intrigeri wrote:
>> anonym wrote (01 Jul 2014 16:38:12 GMT) :
>>> Next (and I think this is unrealted to this branch) in "Scenario:
>>> Upgrading an old Tails USB installation from an ISO image, running on
>>> the old version" I get:
>>
>>>     Then Tails is installed on USB drive "to_upgrade"
>>>                           # features/step_definitions/usb.rb:163
>>>       USB drive 'to_upgrade' has differences in /live:
>>>       Files /lib/live/mount/medium/live/filesystem.packages and
>>> /mnt/new/live/filesystem.packages differ
>>>       Files /lib/live/mount/medium/live/filesystem.squashfs and
>>> /mnt/new/live/filesystem.squashfs differ
>>>       Files /lib/live/mount/medium/live/initrd.img and
>>> /mnt/new/live/initrd.img differ
>>>       Files /lib/live/mount/medium/live/initrd2.img and
>>> /mnt/new/live/initrd2.img differ

>>
>>> I'll get back to this.
>>
>> I'm curious.
>
> Indeed, it's unrelated to bugfix/7443-persistent-files-permission, but
> was introduced in bugfix/7345-upgrade-from-iso-from-1.0-to-1.1.
>
> The problem with "Tails is installed on USB drive X" is that it checks
> that the *running* Tails is installed on the target device, which
> obviously fails when doing an upgrade from ISO running an old Tails.
> That it worked for the same scenario running the current Tails is just
> incidental.
>
> I've pushed a fix in commit f713311 to
> bugfix/7345-upgrade-from-iso-from-1.0-to-1.1 and verified that it works.
> Please review'n'merge into testing and devel.


intrigeri reviewed the code, and trusted me on that I've managed to run
through the tests successfully, so I do the merge myself. Merged!

Cheers!