Commit Graph

14 Commits

Author SHA1 Message Date
Rafał Miłecki
c4c6ef099a procd: fix typo in nand.sh s/TRX/TAR/
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43423 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-28 19:13:24 +00:00
John Crispin
b3fd443967 procd: fix/clean some conditions in nand.sh
1) nand_upgrade_tar: use a simpler condition that matches if () { }
   logic and fix check of $kernel_length variable
2) nand_do_upgrade_stage2: use case, otherwise one could believe we
   always call nand_upgrade_tar

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43373 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 19:14:29 +00:00
John Crispin
b115a21948 procd: document nand.sh a bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43372 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 19:14:17 +00:00
John Crispin
81d9f2d585 scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 12:21:11 +00:00
Felix Fietkau
55fe29b1b9 procd: fix initial nand sysupgrade
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42884 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:50:15 +00:00
Felix Fietkau
e7f7a8d1c5 procd: fix parsing of the has_env parameter
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42883 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:50:01 +00:00
Imre Kaloz
44e7bc82d5 [procd]: allow overriding the kernel partition's name
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41646 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-14 14:53:15 +00:00
Imre Kaloz
bd652ee268 [procd]: we already have a get_magic_long() in common.sh for sysupgrade, don't break it
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41628 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-13 20:51:17 +00:00
John Crispin
19594fc3ed procd: correctly identify ubifs in tar file
A missing path prevents the rootfs type contained in a SysupgradeNAND
tar file from being determined correctly.

This fixes it, and also corrects a minor spelling mistake.

Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-10 19:16:31 +00:00
John Crispin
fd4f6d5215 procd: fix nand.sh kernel_length typo
sysupgrade otherwise skips kernel part on devices which got
kernel in ubi due to kern_length being undefined, kernel_length
is being used instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41327 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:56 +00:00
John Crispin
87a9dcb506 procd: various improvements to nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41278 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-19 14:13:41 +00:00
John Crispin
31f99ff64c procd: some cleanup for SysupgradeNAND
Removed unused ubi file file from template as ubinized images are
passed directly and not inside the tarball.
Also removed left-over white-space.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41237 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-17 15:40:02 +00:00
John Crispin
a0be38dafa procd: various cleanups to /lib/upgrade/nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41222 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-16 18:55:14 +00:00
John Crispin
1d54844bf9 procd: update to latest git HEAD
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41129 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:49 +00:00