Commit Graph

132 Commits

Author SHA1 Message Date
Luka Perkov
7dafec072f base-files: firstboot: pass down arguments such as -y to jffs2reset
This brings back old behavior.

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44651 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-10 23:43:25 +00:00
Imre Kaloz
cfa0c5b27f [base-files]: fix sysupgrade on overlayfs v23+
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 15:55:52 +00:00
John Crispin
81d9f2d585 scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 12:21:11 +00:00
John Crispin
37a33d7e8d sysupgrade: preserve symlinks in backups
Signed-off-by: Catalin Patulea <catalinp@google.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42783 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-06 04:51:56 +00:00
John Crispin
a0be38dafa procd: various cleanups to /lib/upgrade/nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41222 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-16 18:55:14 +00:00
John Crispin
494257f5ab base-files: add an ugly hack for nand to sysupgrade
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41126 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:37 +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
1f0ac4101b sysupgrade: do not kill any processes in failsafe
sysugrade killed the lock causing failsafe to stop

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39318 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-17 22:12:05 +00:00
Felix Fietkau
59559e7972 /sbin/wifi: reload network/wireless on wifi restart
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39036 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-11 19:48:19 +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
9f6dd226eb wifi: restart netifd wifi interfaces on the "up" command like the old variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38990 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-02 16:53:27 +00:00
Felix Fietkau
8a98d2594a wifi: rename the "reload" (restarting non-netifd wifi) command to "reload_legacy"
Add a new "reload" command that reloads the netifd config as well

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38989 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-02 16:53:24 +00:00
Felix Fietkau
3fab0ab03f netifd: add wireless configuration support and port mac80211 to the new framework
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38988 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-02 16:41:03 +00:00
Felix Fietkau
37d0d29e51 base-files: add the DEVICENAME variable for hotplug scripts
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38861 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-19 00:03:39 +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
Jo-Philipp Wich
176af6bad9 base-files: implement -l (--list-backup) sysupgrade parameter to list the files that would be backed up
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37627 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 18:11:55 +00:00
Jo-Philipp Wich
7278ed6283 base-files: abort sysupgrade if file specified with --restore-config is not found
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37624 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 14:10:34 +00:00
Jo-Philipp Wich
6578d45c34 base-files: implement -T (--test) sysupgrade parameter to verify image without actually flashing it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37620 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-30 16:42:05 +00:00
John Crispin
b21f877df0 sysupgrade: create state file so procd knows when a sysupgrade is in progress
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36893 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-10 08:24:31 +00:00
John Crispin
1940283948 mount_root: prepare base-files
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36429 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-25 19:02:32 +00:00
Jonas Gorski
9bfa7f54b7 base-files: firstboot: only ask for confirmation on TTY
Also allow '-y' to force the reset.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36133 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-27 12:39:42 +00:00
Jonas Gorski
fe6dbb1781 base-files: make firstboot ask for confirmation
To prevent accidential resets ask for confirmation (and default to n).

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35712 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-21 11:45:14 +00:00
Jo-Philipp Wich
ec20bc2d5d sysupgrade: clarify online help
Fixes #12346.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34975 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-02 16:21:30 +00:00
Jo-Philipp Wich
21df4e7130 sysupgrade: do not require an extra argument after --restore-backup
Neither --create-backup nor --restore-backup need an image name (following
the backup filename). Treat them in uniform way.

Mostly fixes #12346.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34974 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-02 16:21:26 +00:00
Mirko Vogt
4f4f7ca182 merge /lib/functions/boot.sh and /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34794 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-19 16:07:53 +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
b35dab3480 [package] base-files: provide a sysupgrade -r (--restore-backup) option as convenience wrapper for tar -C / -x(v)zf
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33147 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-12 13:20:27 +00:00
Jo-Philipp Wich
86c37ab542 [package] base-files: fix option parsing of -F/--force parameter
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33075 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-09 18:30:47 +00:00
Jo-Philipp Wich
340bb8ff7a [package] base-files: allow wireless ifaces to be part of multiple networks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32503 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-26 15:25:33 +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
Jo-Philipp Wich
e99cd67232 [package] base-files: implement a --force option for sysupgrade to override image checks, useful to upgrade old ar71xx installations to current trunk ones
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29688 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-08 15:30:37 +00:00
Jo-Philipp Wich
ac4e466297 [package] base-files: add -b (--create-backup) option to sysupgrade, which generates a backup .tar.gz according to the user settings. This will also be reused by LuCI.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-12-20 17:25:15 +00:00
Jo-Philipp Wich
00a17bc44f [package] base-files: kill remaining processes after running user hooks (#10461)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29256 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-19 16:50:25 +00:00
Jo-Philipp Wich
c0432f5687 [package] base-files: properly handle wifi ifaces with no network attached, useful for unmanaged interfaces like used for batman or monitoring
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28860 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 14:42:58 +00:00
Felix Fietkau
1e20e3114a netifd: ensure that a bridge gets created before hostapd needs it, hostapd must not attempt to create the bridge by itself
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28745 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-04 01:05:12 +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
Felix Fietkau
7b8a53966a base-files: move network related scripts to a separate package to make the transition to netifd easier
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28495 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-20 15:01:06 +00:00
Jo-Philipp Wich
eac5958fa7 [package] base-files: attempt bring up related wifi devices when calling ifup
If a user invoked /sbin/ifup to bring up an interface, the setup used to fail
in case of wireless networks tied to a non-bridged interface definition.
Likewise, the bringup of "lan" in the default configuration will reinitialize
the bridge but do not re-join the wireless network to it, requiring an extra
call to /sbin/wifi (which might not be possible anymore due to a severed link
if connected wirelessly).

The changeset modifies the "ifup" command to search for related wireless
devices and call "wifi up" on them if applicable. This way the commands for
wireless and non-wireless interfaces are unified from a cli point of view.

The "ifup -a" case has not been changed to keep the logic of the 
/etc/init.d/network boot sequence. This might be changed later.

Solves #9763.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27720 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-07-22 00:21:20 +00:00
Jo-Philipp Wich
68e0aebc34 [package] base-files: add -h and --help options to sysupgrade (#9728)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27630 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-07-17 09:27:14 +00:00
Jo-Philipp Wich
d399f3a153 [package] base-files: fix error reporting for unsupported protocols on virtual interfaces
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27132 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-06-07 23:25:43 +00:00
Florian Fainelli
bceed84c5e [package] adds a --help option to /sbin/wifi
Signed-off-by: Sebastian Philipp <sebastian@spawnhost.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24258 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-05 11:22:56 +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
Jo-Philipp Wich
3784ca2da7 [package] base-files: sysupgrade: merge info from "opkg list-changed-conffiles" to backup file list
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23233 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 07:40:25 +00:00
Jo-Philipp Wich
a5bd37b0f6 [package] base-files: add an experimental "-c" flag which tries to preserve *all* changed files in /overlay/etc minus some system files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22977 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-09-07 22:20:26 +00:00
Felix Fietkau
fcaea90574 wifi: fix duplicate ht capabilities in the hostapd config file by clearing the list at config load time
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22099 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-08 18:36:12 +00:00
Jo-Philipp Wich
d156518f08 [package] base-files:
- use add_dns() and remove_dns() for when changing resolv.conf.auto for static or dhcp interfaces
	- force 0644 permissions when creating resolv.conf.auto, fixes dnsmasq permissions denied problem with pppd interfaces
	- revert dns servers in /sbin/ifdown
	- bump package revision


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21638 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-30 18:23:43 +00:00
Jo-Philipp Wich
2a8c7ceaf4 [package] base-files, ppp: remove protocol specific cleanup code from /sbin/ifdown and move it to protocol stop callbacks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21383 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 23:24:11 +00:00
Felix Fietkau
986821b28c fix jffs2 and mini_fo mount in failsafe (patch from #7134)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20838 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-13 14:24:58 +00:00
Vasilis Tsiligiannis
1028ae4370 [package] base-files: Use hotplug2 to download firmware
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20683 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-03 18:21:02 +00:00
Vasilis Tsiligiannis
4510803101 [package] base-files: Cancel firmware loading if file doesn't exist
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20649 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-01 15:22:13 +00:00