Commit Graph

30 Commits (21b07b57fbea4500c739712dd3beb9261a2f7f62)

Author SHA1 Message Date
John Crispin 38c81b2552 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40915 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:43:22 +00:00
Felix Fietkau 6b5b2eca73 x86: 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 patch solves ticket #15042 and #14088.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39996 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-21 15:55:07 +00:00
John Crispin 829ffa6bd8 x86: change /dev/console to tty to fix job control
Job control is turned off because it cannot obtain controlling terminal on
/dev/console, so it is impossible to do any job control operation behind
real x86 device (keyboard+monitor or virtualized).

This patch switches /dev/console to tty devices for ash on x86 generic target.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37693 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-04 17:05:33 +00:00
Felix Fietkau 4ea1473546 kernel/base-files: clean up old code related to refreshing mtd partitions, it is no longer used anywhere
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37282 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-14 12:56:58 +00:00
John Crispin 9801819da6 preinit: move cmdline failsafe= handling ot the generic code
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36430 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-25 19:02:37 +00:00
Steven Barth 276de79fca Change default IPv6 config to enable DHCPv6-PD
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36384 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-22 19:40:16 +00:00
Steven Barth 4c9003ffc7 Adapt default network configuration for IPv6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36278 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-09 08:03:08 +00:00
Mirko Vogt fd18877418 Do not overload mount-call - trying to reduce confusion
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh

/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34792 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-19 16:07:46 +00:00
Jo-Philipp Wich d9abff3fe7 x86: allow both old and new grub signatures in sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33898 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-23 16:34:00 +00:00
Felix Fietkau fb421cd989 x86: correct image magic for grub2 images
Sysupgrade broke on x86 when grub2 superceded grub.  This patch
corrects tha magic_word to be expected in grub2 combined images.

Signed-off-by: Russell Senior <russell@personaltelco.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33890 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-22 16:06:29 +00:00
Felix Fietkau ea575c9316 x86: add grub2 iso support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33639 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:01:52 +00:00
Vasilis Tsiligiannis 372091a802 [x86] Fix sysupgrade for squashfs, jffs2 and ext4 images
* use 'fsync' with 'dd' for image writing
	* save config to boot partition

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32465 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-19 22:36:53 +00:00
Felix Fietkau 3ec2817f23 x86/soekris: Add defconfig for soekris net4801 and net4826
Add default config file for net4801 and 4826 and initial script
to copy config file like it is done for other platforms.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25103 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-26 11:33:46 +00:00
Felix Fietkau 19622693b3 x86/soekris: Add script to detect soekris model
Add script to detect soekris board of net4801 and net4826.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25102 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-26 11:33:42 +00:00
Nicolas Thill 19269f57b6 sysupgrade: fix typo in platform_do_upgrade() on x86 (closes: #7068), thanks to acinonyx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20703 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-04 15:47:26 +00:00
Florian Fainelli 80551b78e5 [x86] sysupgrade: Get target device from kernel cmdline, patch from acinonyx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20538 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-28 11:55:07 +00:00
Jo-Philipp Wich 04db1c8265 [x86] sysupgrade: Dump image to sda device instead of hda (patch by Acinonyx)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20514 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-27 15:28:17 +00:00
Jo-Philipp Wich 8d3698602d [x86] base-files: remove redundant "Press " when writing enter failsafe message
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20393 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-23 22:57:16 +00:00
Jo-Philipp Wich 536f5da5d3 [x86] preinit: use grep -q where applicable
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19479 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-02-01 00:33:34 +00:00
Felix Fietkau 6796f8ddbb preinit: Remove Ctrl-C prompt...impossible on /dev/console (patch by cshore)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19367 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-28 19:27:49 +00:00
Felix Fietkau fd4ddfd240 add preinit modularization work by Daniel Dickinson (cshore)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19331 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-25 17:11:17 +00:00
Jo-Philipp Wich ebe49115b1 [PATCH] sysupgrade-ext2 sync before writing image, not after
Sysupgrade for ext2 currently flushes the filesystem buffers after an
image is written to the disk. This should happen before the image is
written.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16867 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-07-16 13:39:36 +00:00
Felix Fietkau 67dae6f31e fix small logic error in x86 sysupgrade script, which prevented upgrades from jffs2 to squashfs (#3321)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12672 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-23 17:46:23 +00:00
Felix Fietkau 3f105986a8 fix sysupgrade support for brcm-2.4 and brcm47xx
make mtd refresh based config append optional (leave enabled on x86)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12657 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-23 11:05:54 +00:00
Travis Kemen bfcfd60f61 fix sysupgrade endian issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11900 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-07-22 01:11:30 +00:00
Felix Fietkau c0663848e7 silence a bogus preinit message
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9429 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-10-24 17:14:09 +00:00
Gabor Juhos 9233c3cdb9 get rid of per-profile base-files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9069 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-09-29 14:27:54 +00:00
John Crispin 2c41016d04 made HOME=/root global instead of x86 specific
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8845 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-09-19 19:58:07 +00:00
John Crispin fa7c428bad root users folder is now in the fs and no longer /tmp
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8844 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-09-19 19:51:11 +00:00
Felix Fietkau 92558d67a4 strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-09-06 16:27:37 +00:00