Commit Graph

58 Commits (90b2348344817d1895789d654fdab306c1db69c7)

Author SHA1 Message Date
John Crispin 0126e7505e sysupgrade: Enable killing of all processes under upgraded
If the sysupgrade scripts is called under upgraded, it will not kill all
other processes as it should to avoid interference by locked filesystem.
This patch checks the parent and if it is upgraded, it kills all.

Signed-off-by: André Valentin <avalentin@marcant.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41563 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-10 19:16:27 +00:00
John Crispin b174e169b7 base-files: fix ramfs / nand upgrade
/lib/{imx6,lantiq,...}.sh are needed in the ramfs for sysupgrade to work.

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41440 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-01 10:26:14 +00:00
John Crispin 41094c6122 base-files: regenerate the /lib64 symlink when switching to a ramdisk
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41284 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-20 13:41:08 +00:00
John Crispin 5b5afc12c3 base-files: add upgraded to the list of daemons not killed
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41268 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-19 14:12:55 +00:00
John Crispin ee158312eb base-files: properly remove stderr from zcat/bzcat
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41135 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 13:00:25 +00:00
John Crispin ca673771fb base-files: include more ubi* tools in sysupgrade ramdisk
Also add some more busybox symlinks which are useful for sysupgrade
on UBI-enabled devices.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41125 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:33 +00:00
John Crispin 90d0f5654a base-files: Allow installation of symlinks using RAMFS_COPY_BIN env var.
http://patchwork.openwrt.org/patch/5086/

Signed-off-by: karl.vogel@gmail.com

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40943 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:45:13 +00:00
John Crispin e11ba4da13 base-files: the ubi tol should be installed when jumping to ram_fs
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40420 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 15:35:20 +00:00
John Crispin 1a579e57fe base-files: make use of new fstools
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40416 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 15:10:15 +00:00
Felix Fietkau 8ce376a524 /lib/functions.sh: move rarely used mtd and macaddr related functions to /lib/functions/system.sh
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40411 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:29:47 +00:00
John Crispin 937a78b306 ubi-utils: mini version of mtd-utils that only includes ubi tools
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40367 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-03 14:26:42 +00:00
John Crispin 2b77148377 fstools: add the new fstools package
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39895 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-12 19:32:51 +00:00
John Crispin 41d0bfcc1f base-files: fix mount-utils incompatibility
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39169 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-27 21:15:09 +00:00
Luka Perkov d723a38780 [package] base-files: fix whitespaces
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39006 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-09 11:30:14 +00:00
Felix Fietkau 9383e3c3c4 ar71xx: Unifi AP Pro sysupgrade patch
The current implementation of mtd will not append the backup
file created by sysupgrade to the correct partition, as mtd will append
the data to first jffs2 partition it finds. As the kernel is also
stored on a jffs2 partition (which resides before the overlay
partition), the data will be appended to this partition.

To fix this problem, a new option

-s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to "0"

is added to mtd.

Signed-off-by: Peter Wagner <tripolar@gmx.at>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38807 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-14 19:38:54 +00:00
Hauke Mehrtens f82ba95657 base-files: don't kill nas for sysupgrade
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38766 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 22:12:58 +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 15816c9cce sysupgrade: fixes broken pipe error during sysupgade
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36548 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-05 12:41:42 +00:00
Florian Fainelli 9cba62ed1a base-files: sysupgrade fail with eglibc
With eglibc, "ldd busybox" give us
    libcrypt.so.1 => /lib/libcrypt.so.1 (0x774be000)
    libm.so.6 => /lib/libm.so.6 (0x773e4000)
    libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x773c0000)
    libc.so.6 => /lib/libc.so.6 (0x77276000)
    /lib/ld.so.1 (0x774fe000)

Thus /lib/ld.so.1 is not printed by the libs fonction and isn't copied to the 'new' root before pivot root
libs() { ldd $* | awk '{print $3}'; }
https://dev.openwrt.org/browser/trunk/package/base-files/files/lib/upgrade/common.sh

With uclibc the last line of "ldd busybox" is
    ld-uClibc.so.0 => /lib/ld-uClibc.so.0 (0x77ada000)

Don't know for musl!

This patch replace https://dev.openwrt.org/changeset/19167, as glibc is gone
The other way around is to rework libs()

Please apply the fix (mine or another) on trunk and AA
Might fix https://dev.openwrt.org/ticket/12273

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36107 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-22 10:06:06 +00:00
John Crispin 13b11cb907 [base-files] sysupgrade was broken as procd was getting killed
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36031 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-14 18:43:58 +00:00
John Crispin 47d1577ffb [base-files] make basefiles aware of procd
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36003 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-13 18:11:19 +00:00
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