Commit Graph

44 Commits (834204bda64d78c5c2d6228c236246291a1ed7d8)

Author SHA1 Message Date
John Crispin 834204bda6 base-files: fix mount-utils incompatibility
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

SVN-Revision: 39169
11 years ago
Luka Perkov 3ceb6b3274 base-files: fix whitespaces
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39006
11 years ago
Felix Fietkau ff17114ba1 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>

SVN-Revision: 38807
11 years ago
Hauke Mehrtens 0d82bbb1fb base-files: don't kill nas for sysupgrade
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>

SVN-Revision: 38766
11 years ago
Felix Fietkau b95bdc8ab5 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>

SVN-Revision: 37282
11 years ago
John Crispin c7c243669c sysupgrade: fixes broken pipe error during sysupgade
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36548
11 years ago
Florian Fainelli 3810cc0f46 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>

SVN-Revision: 36107
11 years ago
John Crispin ada74b8732 sysupgrade was broken as procd was getting killed
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36031
11 years ago
John Crispin f43b7934d2 make basefiles aware of procd
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36003
11 years ago
Mirko Vogt 4cca5cd4fd 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.

SVN-Revision: 34815
12 years ago
Mirko Vogt 439a869090 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'.

SVN-Revision: 34792
12 years ago
Jo-Philipp Wich ff3161a6c4 base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it
SVN-Revision: 32587
12 years ago
Jo-Philipp Wich 9ae901445b /etc/functions.sh => /lib/functions.sh
SVN-Revision: 32062
12 years ago
Felix Fietkau 166db84309 base-files: kill ubusd and udhcpc on sysupgrade as well
SVN-Revision: 31852
12 years ago
Felix Fietkau 5d6628a88c base-files: allow sysupgrade to kill netifd, fixes pppd shutdown on upgrade
SVN-Revision: 31851
12 years ago
Gabor Juhos 6aec1d72c2 package/base-files: copy /lib/functions.sh to the ramfs on sysupgrade
SVN-Revision: 31842
12 years ago
Jo-Philipp Wich 6d80ce78f1 base-files: rewrite killing of nonessential services to not rely on top, use the proc filesystem only
SVN-Revision: 29187
13 years ago
Jo-Philipp Wich 7e3b6aa1f1 base-files: do not kill udhcpc on sysupgrade, it will tear down the interface if terminated
SVN-Revision: 28863
13 years ago
Jo-Philipp Wich daca6a6a97 base-files: do not assume that "top" is busybox' top, but try to call the applet explicitely
SVN-Revision: 28862
13 years ago
Jo-Philipp Wich e3daeabda3 base-files: add some more protected services to sysupgrade kill blacklist
SVN-Revision: 28732
13 years ago
Jo-Philipp Wich ef6d7a7e33 base-files: fix typo
SVN-Revision: 28681
13 years ago
Jo-Philipp Wich 52e93e54bc base-files: sysupgrade: kill all but essential processes before starting the update
SVN-Revision: 28626
13 years ago
Gabor Juhos 4cc48089c7 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>

SVN-Revision: 28616
13 years ago
Jo-Philipp Wich 94c728dc39 base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts
SVN-Revision: 27776
13 years ago
Gabor Juhos 25feec0c9c package/base-files: add get_magic_long() to common upgrade script
Patch-by: Mark Mentovai <mark@moxienet.com>

SVN-Revision: 25117
13 years ago
Florian Fainelli 7af8ee0481 change from /jffs to /overlay, patch from Daniel Dickinson
SVN-Revision: 20356
14 years ago
Jo-Philipp Wich 39f2b6d957 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>
SVN-Revision: 19167
15 years ago
Jo-Philipp Wich 7d1c2a0612 base-files: fix sysupgrade get_magic_word() function to return proper values if the first two bytes are identical
SVN-Revision: 17319
15 years ago
Vasilis Tsiligiannis baa9053e7a base-files: Fix sysupgrade .tar.gz configuration restoring
SVN-Revision: 16626
15 years ago
Jo-Philipp Wich c6fe201fb6 sysupgrade: sync *before* mtd write, only fallback to sysrq-trigger if standard reboot fails
SVN-Revision: 16488
15 years ago
Vasilis Tsiligiannis f4a81139b7 base-files: Add support for bzipped images in sysupgrade
SVN-Revision: 16408
15 years ago
Vasilis Tsiligiannis 57d7cc7666 base-files: Detect and decompressed gzipped images automatically when flashing with sysupgrade
SVN-Revision: 16407
15 years ago
Vasilis Tsiligiannis d1f5700e78 base-files: format hexdump output instead of using awk for sysupgrade
SVN-Revision: 16405
15 years ago
Vasilis Tsiligiannis 5b72dc3d8f base-files: fix test experession for sysupgrade
SVN-Revision: 16310
15 years ago
Jo-Philipp Wich af8500e97d sysupgrade: use sysrq-trigger if available
SVN-Revision: 15865
15 years ago
Jo-Philipp Wich d8aee6e471 base-files: show reboot notification is sysupgrade
SVN-Revision: 15730
15 years ago
Jo-Philipp Wich 71e0f59b80 Add option in sysupgrade to flash gzipped images
SVN-Revision: 15672
15 years ago
Jo-Philipp Wich 8a6acee2e2 sysupgrade: install /bin/sleep into ramdisk too and add completition notice (#4747)
SVN-Revision: 14784
15 years ago
Felix Fietkau 7300d22877 install missing busybox symlinks for sysupgrade (patch by Frédéric Moulins)
SVN-Revision: 12695
16 years ago
Felix Fietkau f47a4a58c5 fix sysupgrade support for brcm-2.4 and brcm47xx make mtd refresh based config append optional (leave enabled on x86)
SVN-Revision: 12657
16 years ago
Felix Fietkau 22585e578b sysupgrade: add optional delay before rebooting
SVN-Revision: 12572
16 years ago
Travis Kemen 7346ef83e1 fix sysupgrade endian issues
SVN-Revision: 11900
16 years ago
Felix Fietkau 036b397595 fix sysupgrade 'do_upgrade: not found' error
SVN-Revision: 11362
16 years ago
Felix Fietkau 1e38527a52 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
SVN-Revision: 8456
17 years ago