domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,023 Commits 6 Branches 28 Tags
0765466a42f46f7357e260866a4284ed567bb7ad
Commit Graph

160 Commits

Author SHA1 Message Date
Felix Fietkau
7a5002ec9d base-files: add /etc/shadow to list of essential files to keep in sysupgrade (bug 18206) 
Based on bug #18206 sysupgrade can lead to loss of password information in
certain situations. Most likely all users who will upgrade from versions
r43017-43040, will lose their current passwords. :-(
https://dev.openwrt.org/ticket/18206

Currently /etc/shadow is defined as a conffile in base-files:
https://dev.openwrt.org/browser/trunk/package/base-files/Makefile#L37

But it is not defined in the default list of essential files to keep in
sysupgrade:
https://dev.openwrt.org/browser/trunk/package/base-files/files/lib/upgrade/keep.d/base-files-essential

If exporting conffiles info fails, /etc/shadow can get lost.

Shadow passwords are now the default, so saying that preserving /etc/passwd
is essential while /etc/shadow is not, makes no sense.

The attached patch adds /etc/shadow to the list of essential files.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 43061
 2014-10-25 17:22:46 +00:00
Felix Fietkau
0ef474a118 base-files: fix ldd definition if /usr/bin/ldd exists 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42976
 2014-10-19 21:46:08 +00:00
John Crispin
be26421f45 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>

SVN-Revision: 41563
 2014-07-10 19:16:27 +00:00
John Crispin
66ae4803e2 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>

SVN-Revision: 41440
 2014-07-01 10:26:14 +00:00
John Crispin
09273f5c0a base-files: regenerate the /lib64 symlink when switching to a ramdisk 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41284
 2014-06-20 13:41:08 +00:00
John Crispin
4b1c48bc93 base-files: add upgraded to the list of daemons not killed 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41268
 2014-06-19 14:12:55 +00:00
John Crispin
bedd6f44a5 base-files: properly remove stderr from zcat/bzcat 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41135
 2014-06-11 13:00:25 +00:00
John Crispin
e73538ba56 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>

SVN-Revision: 41125
 2014-06-11 12:59:33 +00:00
John Crispin
0de0310a9c 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

SVN-Revision: 40943
 2014-06-02 12:45:13 +00:00
John Crispin
665d39f698 base-files: the ubi tol should be installed when jumping to ram_fs 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40420
 2014-04-07 15:35:20 +00:00
John Crispin
1d5ac95850 base-files: make use of new fstools 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40416
 2014-04-07 15:10:15 +00:00
Felix Fietkau
4a9ea80ef0 /lib/functions.sh: move rarely used mtd and macaddr related functions to /lib/functions/system.sh 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40411
 2014-04-07 10:29:47 +00:00
John Crispin
08b4924401 ubi-utils: mini version of mtd-utils that only includes ubi tools 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40367
 2014-04-03 14:26:42 +00:00
John Crispin
0dc9d8d6ff fstools: add the new fstools package 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 39895
 2014-03-12 19:32:51 +00:00
John Crispin
834204bda6 base-files: fix mount-utils incompatibility 
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

SVN-Revision: 39169
 2013-12-27 21:15:09 +00:00
Luka Perkov
3ceb6b3274 base-files: fix whitespaces 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39006
 2013-12-09 11:30:14 +00:00
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
 2013-11-14 19:38:54 +00:00
Hauke Mehrtens
0d82bbb1fb base-files: don't kill nas for sysupgrade 
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>

SVN-Revision: 38766
 2013-11-11 22:12:58 +00:00
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
 2013-07-14 12:56:58 +00:00
John Crispin
c7c243669c sysupgrade: fixes broken pipe error during sysupgade 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36548
 2013-05-05 12:41:42 +00:00
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
 2013-03-22 10:06:06 +00:00
John Crispin
ada74b8732 sysupgrade was broken as procd was getting killed 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36031
 2013-03-14 18:43:58 +00:00
John Crispin
f43b7934d2 make basefiles aware of procd 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36003
 2013-03-13 18:11:19 +00:00
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
 2012-12-21 12:10:21 +00:00
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
 2012-12-19 16:07:46 +00:00
Jo-Philipp Wich
ff3161a6c4 base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it 
SVN-Revision: 32587
 2012-07-03 15:43:43 +00:00
Jo-Philipp Wich
9ae901445b /etc/functions.sh => /lib/functions.sh 
SVN-Revision: 32062
 2012-06-05 16:04:23 +00:00
Felix Fietkau
166db84309 base-files: kill ubusd and udhcpc on sysupgrade as well 
SVN-Revision: 31852
 2012-05-23 21:54:12 +00:00
Felix Fietkau
5d6628a88c base-files: allow sysupgrade to kill netifd, fixes pppd shutdown on upgrade 
SVN-Revision: 31851
 2012-05-23 21:49:31 +00:00
Gabor Juhos
6aec1d72c2 package/base-files: copy /lib/functions.sh to the ramfs on sysupgrade 
SVN-Revision: 31842
 2012-05-23 21:05:20 +00:00
Jo-Philipp Wich
6d80ce78f1 base-files: rewrite killing of nonessential services to not rely on top, use the proc filesystem only 
SVN-Revision: 29187
 2011-11-16 15:01:18 +00:00
Jo-Philipp Wich
7e3b6aa1f1 base-files: do not kill udhcpc on sysupgrade, it will tear down the interface if terminated 
SVN-Revision: 28863
 2011-11-08 19:14:55 +00:00
Jo-Philipp Wich
daca6a6a97 base-files: do not assume that "top" is busybox' top, but try to call the applet explicitely 
SVN-Revision: 28862
 2011-11-08 18:48:38 +00:00
Jo-Philipp Wich
e3daeabda3 base-files: add some more protected services to sysupgrade kill blacklist 
SVN-Revision: 28732
 2011-11-03 19:25:25 +00:00
Jo-Philipp Wich
ef6d7a7e33 base-files: fix typo 
SVN-Revision: 28681
 2011-10-30 15:48:14 +00:00
Jo-Philipp Wich
52e93e54bc base-files: sysupgrade: kill all but essential processes before starting the update 
SVN-Revision: 28626
 2011-10-27 16:52:31 +00:00
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
 2011-10-27 07:54:49 +00:00
Jo-Philipp Wich
94c728dc39 base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts 
SVN-Revision: 27776
 2011-07-25 22:19:55 +00:00
Gabor Juhos
25feec0c9c package/base-files: add get_magic_long() to common upgrade script 
Patch-by: Mark Mentovai <mark@moxienet.com>

SVN-Revision: 25117
 2011-01-26 20:35:37 +00:00
Jo-Philipp Wich
deb9661785 Âbase-files: don't mark /etc/banner as conffile 
SVN-Revision: 24742
 2010-12-20 19:51:05 +00:00
Jo-Philipp Wich
d80f82d7a4 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 
SVN-Revision: 23258
 2010-10-05 19:24:12 +00:00
Florian Fainelli
7af8ee0481 change from /jffs to /overlay, patch from Daniel Dickinson 
SVN-Revision: 20356
 2010-03-21 17:16:50 +00:00
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
 2010-01-16 13:39:13 +00:00
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
 2009-08-19 19:12:34 +00:00
Vasilis Tsiligiannis
baa9053e7a base-files: Fix sysupgrade .tar.gz configuration restoring 
SVN-Revision: 16626
 2009-06-29 21:13:05 +00:00
Jo-Philipp Wich
c6fe201fb6 sysupgrade: sync *before* mtd write, only fallback to sysrq-trigger if standard reboot fails 
SVN-Revision: 16488
 2009-06-17 11:09:10 +00:00
Vasilis Tsiligiannis
f4a81139b7 base-files: Add support for bzipped images in sysupgrade 
SVN-Revision: 16408
 2009-06-10 22:34:14 +00:00
Vasilis Tsiligiannis
57d7cc7666 base-files: Detect and decompressed gzipped images automatically when flashing with sysupgrade 
SVN-Revision: 16407
 2009-06-10 22:22:48 +00:00
Vasilis Tsiligiannis
d1f5700e78 base-files: format hexdump output instead of using awk for sysupgrade 
SVN-Revision: 16405
 2009-06-10 21:52:07 +00:00
Vasilis Tsiligiannis
5b72dc3d8f base-files: fix test experession for sysupgrade 
SVN-Revision: 16310
 2009-06-03 18:15:04 +00:00