Commit Graph

37 Commits

Author SHA1 Message Date
Mirko Vogt
1a59d79237 [package/base-files] hot-fix nameclash in sysupgrade: rename pivot() to supivot() in sysupgrade
Sysupgrade defines its very own pivot() function.
Prior merging boot.sh and functions.sh sysupgrade just included boot.sh,
now it includes functions.sh which defines pivot() as well, however
slightly different which causes sysupgrade to fail.

This is a hot-fix to unbreak sysupgrade, however those two pivot()
functions should actually get merged.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34815 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-21 12:10:21 +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
1f88d93e7e [package] base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-03 15:43:43 +00:00
Jo-Philipp Wich
75a299db50 [package] /etc/functions.sh => /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32062 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-05 16:04:23 +00:00
Felix Fietkau
010cd3161d base-files: kill ubusd and udhcpc on sysupgrade as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31852 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:54:12 +00:00
Felix Fietkau
c136759736 base-files: allow sysupgrade to kill netifd, fixes pppd shutdown on upgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31851 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:49:31 +00:00
Gabor Juhos
0e9d604ef7 package/base-files: copy /lib/functions.sh to the ramfs on sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31842 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:05:20 +00:00
Jo-Philipp Wich
18290fc7db [package] base-files: rewrite killing of nonessential services to not rely on top, use the proc filesystem only
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29187 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-16 15:01:18 +00:00
Jo-Philipp Wich
9b971f6486 [package] base-files: do not kill udhcpc on sysupgrade, it will tear down the interface if terminated
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28863 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 19:14:55 +00:00
Jo-Philipp Wich
2df11b3cba [package] base-files: do not assume that "top" is busybox' top, but try to call the applet explicitely
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28862 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 18:48:38 +00:00
Jo-Philipp Wich
c16e9c5abf [package] base-files: add some more protected services to sysupgrade kill blacklist
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28732 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-03 19:25:25 +00:00
Jo-Philipp Wich
2822ce35c6 [package] base-files: fix typo
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28681 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-30 15:48:14 +00:00
Jo-Philipp Wich
1b7836ca8c [package] base-files: sysupgrade: kill all but essential processes before starting the update
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28626 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-27 16:52:31 +00:00
Gabor Juhos
8c813ee59d base-files/sysupgrade: add more busybox applet symlinks to ramdisk
Adds symlinks for printf and wc to make life happier in the sysupgrade ramdisk.
Also make code more readable by escaping that overly long line.

Signed-off-by: Daniel Golle <dgolle@allnet.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28616 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-27 07:54:49 +00:00
Jo-Philipp Wich
7b463936a2 [package] base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27776 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-07-25 22:19:55 +00:00
Gabor Juhos
4215ce81ce package/base-files: add get_magic_long() to common upgrade script
Patch-by: Mark Mentovai <mark@moxienet.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25117 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-26 20:35:37 +00:00
Jo-Philipp Wich
610b9a3c7b [package]Âbase-files: don't mark /etc/banner as conffile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24742 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-20 19:51:05 +00:00
Jo-Philipp Wich
a81762a0b3 [package] base-files:
- add sysupgrade support for keepfile hints
		* introduces /lib/upgrade/keep.d/ for per-package keepfile lists
		* introduces /etc/sysupgrade.conf for user defined keepfile hints
	- prime /lib/upgrade/keep.d/base-files-essential to keep sysupgrade usable for images without opkg
	- change sysupgrade to build the keepfile list from /lib/upgrade/keep.d/, /etc/sysupgrade.conf and
	  opkg list-changed-conffiles


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23258 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 19:24:12 +00:00
Florian Fainelli
6e84b166c4 change from /jffs to /overlay, patch from Daniel Dickinson
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20356 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-21 17:16:50 +00:00
Jo-Philipp Wich
35f17d4c9b [package] base-files:
sysupgade library coomon.sh has "bug" in glibc enviorement. For some reason
ld-linux.so.3 is not installed at ramfs and sysupgrade always fails.
Signed-off-by: Zintis Petersons <zintis.petersons@e-mail.lv>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19167 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-01-16 13:39:13 +00:00
Jo-Philipp Wich
62211d33ed [package] base-files: fix sysupgrade get_magic_word() function to return proper values if the first two bytes are identical
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17319 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-08-19 19:12:34 +00:00
Vasilis Tsiligiannis
a4fb93f134 [package] base-files: Fix sysupgrade .tar.gz configuration restoring
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16626 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-29 21:13:05 +00:00
Jo-Philipp Wich
1cd6c8a2c0 [package] sysupgrade: sync *before* mtd write, only fallback to sysrq-trigger if standard reboot fails
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16488 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-17 11:09:10 +00:00
Vasilis Tsiligiannis
4dea1d7f5f [package] base-files: Add support for bzipped images in sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16408 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-10 22:34:14 +00:00
Vasilis Tsiligiannis
ef3d91790c [package] base-files: Detect and decompressed gzipped images automatically when flashing with sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16407 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-10 22:22:48 +00:00
Vasilis Tsiligiannis
b03a3a118a [package] base-files: format hexdump output instead of using awk for sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16405 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-10 21:52:07 +00:00
Vasilis Tsiligiannis
c5a5c25d0f [package] base-files: fix test experession for sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16310 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-03 18:15:04 +00:00
Jo-Philipp Wich
55317e85f0 [package] sysupgrade: use sysrq-trigger if available
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15865 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-15 12:10:26 +00:00
Jo-Philipp Wich
14cb1da422 [package] base-files: show reboot notification is sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15730 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-09 01:54:09 +00:00
Jo-Philipp Wich
f47863235d [PATCH] Add option in sysupgrade to flash gzipped images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15672 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-07 13:27:10 +00:00
Jo-Philipp Wich
a53587df97 [package] sysupgrade: install /bin/sleep into ramdisk too and add completition notice (#4747)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14784 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-03-08 00:21:25 +00:00
Felix Fietkau
537ce29c80 install missing busybox symlinks for sysupgrade (patch by Frédéric Moulins)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12695 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-25 11:31:35 +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
Felix Fietkau
bd26d77953 sysupgrade: add optional delay before rebooting
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12572 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-12 19:51:30 +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
0174cbc49a fix sysupgrade 'do_upgrade: not found' error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11362 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-06-04 23:20:56 +00:00
Felix Fietkau
fe9d7531d8 add sysupgrade script for config preserving system upgrades. only implemented for x86-2.6 at the moment, but can be ported to other platforms easily
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8456 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-08-21 18:23:57 +00:00