Commit Graph

6 Commits (ed7d8a04508fcb4041b2b44277f4cfd3a6debbdb)

Author SHA1 Message Date
Jo-Philipp Wich 05abf01ac0 x86_64: fix invoking sysupgrade on PARTUUID mounted system
Fix sysupgrade to determine the correct boot block device to use if
/proc/cmdline contains a PARTUUID root.

Change the preinit move_config() hook to use the UUID scanning code
from sysupgrade in order to avoid code duplication.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42968
2014-10-19 20:28:43 +00:00
Jo-Philipp Wich 226db60627 x86_64: sysupgrade: consider hdX and vdX devices as well
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42965
2014-10-19 17:13:50 +00:00
Jo-Philipp Wich 45d2e6d5a0 x86_64: support sysupgrade config restore on PARTUUID mounted disks
Fix the move_config() procedure to properly find the corresponding disk if
the rootfs was mounted by PARTUUID instead of a device node.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42946
2014-10-17 22:50:38 +00:00
John Crispin f933a741a9 target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC
ARGC is a 'C-ism', but not known/valid in shell-syntax - insert the correct
var $# (=number of args) here. under normal conditions this had no impact,
but we should at least correct it. the error was observable like this:

root@box:~ [ -e "/etc/functions.sh" ] && . /etc/functions.sh
root@box:~ [ -e "/lib/functions.sh" ] && . /lib/functions.sh
root@box:~ . /lib/upgrade/platform.sh
root@box:~ . /lib/upgrade/common.sh
root@box:~ platform_check_image /tmp/myfirmware.bin
ash: bad number
root@box:~ echo $?
0

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 40915
2014-06-02 12:43:22 +00:00
Felix Fietkau 7c78ab8c21 x86_64: fix sysupgrade
Function move_config should be called after or during preinit_mount_root
hook in do_mount_root function. At this state sysupgrade.tgz is not in its
place during that time when do_mount_root is called. Function move_config
is called later so the sysupgrade.tgz stays in root directory to the second
restart when it is unpacked properly.

This patch adds move_config function to preinit_mount_root hook instead
of preinit_main and changes the filename of script to be called before
80_mount_root is called. It will prepare the sysupgrade archive for do_mount_root
within preinit_mount_root hook.

This issue was introduced for target x86. Since the target for x86_64 is
similar to x86, this issue is present also in this target. It solves the
ticket #15042 and #14088.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
Tested-By: Stefan Hellermann <stefan@the2masters.de>

SVN-Revision: 39997
2014-03-21 15:55:11 +00:00
Imre Kaloz 7aaa9bc91c add x86_64 target support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 39208
2014-01-07 12:23:35 +00:00