Commit Graph

180 Commits

Author SHA1 Message Date
John Crispin
20940138ac 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>

SVN-Revision: 42911
2014-10-14 12:21:11 +00:00
John Crispin
7860c9707a sysupgrade: preserve symlinks in backups
Signed-off-by: Catalin Patulea <catalinp@google.com>

SVN-Revision: 42783
2014-10-06 04:51:56 +00:00
John Crispin
3dca5a158d procd: various cleanups to /lib/upgrade/nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41222
2014-06-16 18:55:14 +00:00
John Crispin
c43d614f89 base-files: add an ugly hack for nand to sysupgrade
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41126
2014-06-11 12:59:37 +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
f18112883f sysupgrade: do not kill any processes in failsafe
sysugrade killed the lock causing failsafe to stop

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

SVN-Revision: 39318
2014-01-17 22:12:05 +00:00
Felix Fietkau
b656a56225 /sbin/wifi: reload network/wireless on wifi restart
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39036
2013-12-11 19:48:19 +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
6e0fafd816 wifi: restart netifd wifi interfaces on the "up" command like the old variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38990
2013-12-02 16:53:27 +00:00
Felix Fietkau
3c50feca19 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>

SVN-Revision: 38989
2013-12-02 16:53:24 +00:00
Felix Fietkau
498d84fc4e netifd: add wireless configuration support and port mac80211 to the new framework
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38988
2013-12-02 16:41:03 +00:00
Felix Fietkau
69598dd020 base-files: add the DEVICENAME variable for hotplug scripts
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38861
2013-11-19 00:03:39 +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
Jo-Philipp Wich
b7f8f212ae base-files: implement -l (--list-backup) sysupgrade parameter to list the files that would be backed up
SVN-Revision: 37627
2013-07-31 18:11:55 +00:00
Jo-Philipp Wich
2a1ccf1830 base-files: abort sysupgrade if file specified with --restore-config is not found
SVN-Revision: 37624
2013-07-31 14:10:34 +00:00
Jo-Philipp Wich
2771edf647 base-files: implement -T (--test) sysupgrade parameter to verify image without actually flashing it
SVN-Revision: 37620
2013-07-30 16:42:05 +00:00
John Crispin
1f52c5a72c sysupgrade: create state file so procd knows when a sysupgrade is in progress
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36893
2013-06-10 08:24:31 +00:00
John Crispin
811d90ff40 mount_root: prepare base-files
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36429
2013-04-25 19:02:32 +00:00
Jonas Gorski
574bab45ac base-files: firstboot: only ask for confirmation on TTY
Also allow '-y' to force the reset.

SVN-Revision: 36133
2013-03-27 12:39:42 +00:00
Jonas Gorski
29a3af1bb8 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>

SVN-Revision: 35712
2013-02-21 11:45:14 +00:00
Jo-Philipp Wich
70b0ef6322 sysupgrade: clarify online help
Fixes #12346.

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

SVN-Revision: 34975
2013-01-02 16:21:30 +00:00
Jo-Philipp Wich
58070b0083 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>

SVN-Revision: 34974
2013-01-02 16:21:26 +00:00
Mirko Vogt
4d4b2d3ced merge /lib/functions/boot.sh and /lib/functions.sh
SVN-Revision: 34794
2012-12-19 16:07:53 +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
70aaa116eb base-files: provide a sysupgrade -r (--restore-backup) option as convenience wrapper for tar -C / -x(v)zf
SVN-Revision: 33147
2012-08-12 13:20:27 +00:00
Jo-Philipp Wich
17dc1d5c44 base-files: fix option parsing of -F/--force parameter
SVN-Revision: 33075
2012-08-09 18:30:47 +00:00
Jo-Philipp Wich
f2dde4f5ba base-files: allow wireless ifaces to be part of multiple networks
SVN-Revision: 32503
2012-06-26 15:25:33 +00:00
Jo-Philipp Wich
9ae901445b /etc/functions.sh => /lib/functions.sh
SVN-Revision: 32062
2012-06-05 16:04:23 +00:00
Jo-Philipp Wich
4e88bcfb00 base-files: implement a --force option for sysupgrade to override image checks, useful to upgrade old ar71xx installations to current trunk ones
SVN-Revision: 29688
2012-01-08 15:30:37 +00:00
Jo-Philipp Wich
1c6821b42e 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.
SVN-Revision: 29587
2011-12-20 17:25:15 +00:00
Jo-Philipp Wich
d46e17548b base-files: kill remaining processes after running user hooks (#10461)
SVN-Revision: 29256
2011-11-19 16:50:25 +00:00
Jo-Philipp Wich
a73fffe857 base-files: properly handle wifi ifaces with no network attached, useful for unmanaged interfaces like used for batman or monitoring
SVN-Revision: 28860
2011-11-08 14:42:58 +00:00
Felix Fietkau
dab5ebaa76 netifd: ensure that a bridge gets created before hostapd needs it, hostapd must not attempt to create the bridge by itself
SVN-Revision: 28745
2011-11-04 01:05:12 +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
Felix Fietkau
c2b5767572 base-files: move network related scripts to a separate package to make the transition to netifd easier
SVN-Revision: 28495
2011-10-20 15:01:06 +00:00
Jo-Philipp Wich
365f76551a 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.

SVN-Revision: 27720
2011-07-22 00:21:20 +00:00
Jo-Philipp Wich
1e34c02e3e base-files: add -h and --help options to sysupgrade (#9728)
SVN-Revision: 27630
2011-07-17 09:27:14 +00:00
Jo-Philipp Wich
97ee10d691 base-files: fix error reporting for unsupported protocols on virtual interfaces
SVN-Revision: 27132
2011-06-07 23:25:43 +00:00
Florian Fainelli
ebe7bdba88 adds a --help option to /sbin/wifi
Signed-off-by: Sebastian Philipp <sebastian@spawnhost.de>

SVN-Revision: 24258
2010-12-05 11:22:56 +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
Jo-Philipp Wich
978ecae685 base-files: sysupgrade: merge info from "opkg list-changed-conffiles" to backup file list
SVN-Revision: 23233
2010-10-05 07:40:25 +00:00
Jo-Philipp Wich
91118a9500 base-files: add an experimental "-c" flag which tries to preserve *all* changed files in /overlay/etc minus some system files
SVN-Revision: 22977
2010-09-07 22:20:26 +00:00
Felix Fietkau
3e75044a95 wifi: fix duplicate ht capabilities in the hostapd config file by clearing the list at config load time
SVN-Revision: 22099
2010-07-08 18:36:12 +00:00
Jo-Philipp Wich
261d41a906 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
SVN-Revision: 21638
2010-05-30 18:23:43 +00:00
Jo-Philipp Wich
66ab73d01f base-files, ppp: remove protocol specific cleanup code from /sbin/ifdown and move it to protocol stop callbacks
SVN-Revision: 21383
2010-05-05 23:24:11 +00:00
Felix Fietkau
c82bcb2a29 fix jffs2 and mini_fo mount in failsafe (patch from #7134)
SVN-Revision: 20838
2010-04-13 14:24:58 +00:00
Vasilis Tsiligiannis
a1e4c66c16 base-files: Use hotplug2 to download firmware
SVN-Revision: 20683
2010-04-03 18:21:02 +00:00
Vasilis Tsiligiannis
043b77a460 base-files: Cancel firmware loading if file doesn't exist
SVN-Revision: 20649
2010-04-01 15:22:13 +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
Nicolas Thill
71886caf3f firstboot: detect mtd, rom & jffs parts first, fix jffs mounted test
SVN-Revision: 19980
2010-03-05 00:53:51 +00:00
Travis Kemen
32f6e6c44d revert r19964 for now, there are issues with opkg/ipkg.py generating the status db
SVN-Revision: 19970
2010-03-04 02:42:23 +00:00
Travis Kemen
249d48a68e grab all config files for installed packages, closes #3718
SVN-Revision: 19964
2010-03-03 18:19:19 +00:00
Felix Fietkau
19555b702e /sbin/wifi: improve reliability of restarts by resetting the state properly
SVN-Revision: 19495
2010-02-02 02:19:10 +00:00
Felix Fietkau
56bc02a305 add preinit modularization work by Daniel Dickinson (cshore)
SVN-Revision: 19331
2010-01-25 17:11:17 +00:00
Felix Fietkau
62d7bb6ecd fix a typo in the hwmode handling in /sbin/wifi (thx, maddes)
SVN-Revision: 19313
2010-01-24 14:27:27 +00:00
Jo-Philipp Wich
cb30b52ec1 base-files, mac80211 (#6491) - fix wep key handling in iw with mac80211 based drivers - sanitize keys where necessary - put a procedure prepare_key_wep() into /sbin/wifi for use by other driver backends
SVN-Revision: 19118
2010-01-13 18:39:44 +00:00
Felix Fietkau
4ab57b9e0f fix firmware loading broken by the busybox upgrade
SVN-Revision: 18705
2009-12-08 20:04:38 +00:00
Jo-Philipp Wich
4d9b1d6c75 base-files: sysupgrade: restrict find command to plain files to avoid duplicates when generating the conffiles tgz archive
SVN-Revision: 18455
2009-11-20 23:02:35 +00:00
Felix Fietkau
8183d10d17 check for sysfs before bypassing normal hotplug calls for firmware events (fixes #5200)
SVN-Revision: 17839
2009-10-03 11:28:02 +00:00
Felix Fietkau
2da13936e9 firstboot: add support for union mounts
SVN-Revision: 17778
2009-09-27 22:56:21 +00:00
Felix Fietkau
0f9f23aebe base-files: move firstboot to /sbin
SVN-Revision: 17775
2009-09-27 22:56:11 +00:00
Jo-Philipp Wich
bc37b2e831 base-files: dispatch ifdown events for proto=none interfaces and fix a race condition between revert state and hotplug handlers
SVN-Revision: 17582
2009-09-14 16:14:27 +00:00
Jo-Philipp Wich
8962270fec base-files: add /etc/rc.local to the default save file list
SVN-Revision: 17572
2009-09-12 15:57:31 +00:00
Vasilis Tsiligiannis
baa9053e7a base-files: Fix sysupgrade .tar.gz configuration restoring
SVN-Revision: 16626
2009-06-29 21:13:05 +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
Nicolas Thill
06413b783e base-files: initialize GZIPED to 0 in sysupgrade since it's used later in numeric comparisons
SVN-Revision: 15890
2009-05-17 11:54:44 +00:00
Jo-Philipp Wich
7da25b844c Don't try to pivot to new ramfs if already running on one This patch allows the sysupgrade script to continue with the upgrade if openwrt is already running on a ramfs. This allows the use of the sysupgrade script as an _installer_ when running from an iso image. A user could boot the system from a bootable cd and invoke sysupgrade -n <URL> to write an image to the hard disk or CF.
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>

SVN-Revision: 15683
2009-05-07 13:51:45 +00:00
Jo-Philipp Wich
71e0f59b80 Add option in sysupgrade to flash gzipped images
SVN-Revision: 15672
2009-05-07 13:27:10 +00:00
Hauke Mehrtens
90fc200a60 In wifi_fixup_hwmode the value 11bg for hwmode was not transfered to bg.
SVN-Revision: 15180
2009-04-09 20:16:01 +00:00
Felix Fietkau
ca749bea97 wifi: fix hostapd + autochannel
SVN-Revision: 15055
2009-03-27 21:14:59 +00:00
Jo-Philipp Wich
9a72419724 - fix mac assignment for broadcom vifs in bridging mode - thanks abramoff1 for spotting this - fix possible regression with different interface protocols - bump PKG_RELEASE
SVN-Revision: 15042
2009-03-25 19:13:15 +00:00
Jo-Philipp Wich
7e6c947e4b sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa
SVN-Revision: 15028
2009-03-24 23:42:09 +00:00
Jose Vasconcellos
58b8cdb5fd Use block events for the mounting/unmounting of external storage devices. This handles both USB and IEEE1394 devices. It removes /sbin/usb-storage in favor of using the block hotplug event. There are dummy scripts to handle the plug in/out of USB and IEEE1394 devices for updating LEDs. Storage devices are mount as a sub-directory under /mnt.
SVN-Revision: 14289
2009-01-30 20:48:42 +00:00
Felix Fietkau
7ac69660fe fix ifup (no longer use the to-be-reverted state of the previous config)
SVN-Revision: 13398
2008-11-28 16:13:23 +00:00
Travis Kemen
6103f88358 remove /tmp/resolv.conf.auto when ifup -a is called so that any old dns servers no longer in the config get cleared
SVN-Revision: 13082
2008-10-29 20:31:14 +00:00
Felix Fietkau
a4f11ca22e use pidfiles for hostapd/wpa_supplicant instead of killing all processes when bringing an interface down - fixes an issue with random hostapd death
SVN-Revision: 13078
2008-10-29 17:26:49 +00:00
Felix Fietkau
c0e753bcdc make sure that the dhcp client (or other processes necessary to get a connection) gets restarted when the wifi is restarted
SVN-Revision: 13026
2008-10-23 01:07:35 +00:00
Felix Fietkau
2b2884293a add option in sysupgrade to restore config from file or URL (patch from #4043)
SVN-Revision: 12772
2008-09-28 19:45:59 +00:00
Felix Fietkau
e2daafdb1d fix typo from last sysupgrade commit
SVN-Revision: 12715
2008-09-26 08:58:43 +00:00
Travis Kemen
3770c99cf8 add switch to not save configuration over the reflash in noninteractive mode
SVN-Revision: 12714
2008-09-26 00:10:01 +00:00
Travis Kemen
91d3e6b05b make option name optional
SVN-Revision: 12585
2008-09-13 00:08:39 +00:00
Felix Fietkau
22585e578b sysupgrade: add optional delay before rebooting
SVN-Revision: 12572
2008-09-12 19:51:30 +00:00
Steven Barth
5a4e88710b Prevent unwanted shell expansion
SVN-Revision: 12568
2008-09-11 12:23:20 +00:00
John Crispin
6eefb5071d fixes script that mounts usd storage when it gets attached
SVN-Revision: 12548
2008-09-08 09:30:57 +00:00
John Crispin
38516cd780 fixes usb storage mounting
SVN-Revision: 12465
2008-09-01 17:42:35 +00:00
Travis Kemen
b3b5e54099 add /etc/firewall.user to be backed up becuase it is an example in /etc/config/firewall
SVN-Revision: 12326
2008-08-16 18:01:18 +00:00
Travis Kemen
0b2111d1fb remove /etc/firewall.* from being kept as they no longer are used in trunk
SVN-Revision: 12320
2008-08-16 16:04:51 +00:00
Felix Fietkau
c05eb4ba63 add basic interface alias support. for now (since we don't use ip in our network scripts yet), it adds :1, :2, ... alias interfaces this will change when we add support for the ip utility, but the config format will remain the same. example:
config alias     test
option interface lan
option ipaddr    192.168.1.1
option netmask   255.255.0.0

SVN-Revision: 12241
2008-08-07 15:28:48 +00:00
John Crispin
72396bd614 add uci led support - /etc/config/system can hold led info which is applied at boot - adds /sbin/led.sh to set/clear leds via a name defined in /etc/config/system
SVN-Revision: 12104
2008-08-04 22:56:46 +00:00
Felix Fietkau
8ff90e326e network scripts: revert the network state after running ifdown, not before
SVN-Revision: 12081
2008-08-03 21:00:01 +00:00
Travis Kemen
0425daa86d keep /etc/group over reflash as well
SVN-Revision: 11919
2008-07-24 16:36:39 +00:00
Travis Kemen
f20dd0803c add dropbear keys, passwd and firewall configuration to be saved during reflash
SVN-Revision: 11912
2008-07-24 02:24:59 +00:00
Felix Fietkau
0cf1a58282 Here comes the new UCI. Enjoy :)
SVN-Revision: 10367
2008-02-03 06:48:15 +00:00
Gabor Juhos
5fb714cca9 base-files: suppress error messages in usb-storage script
SVN-Revision: 9498
2007-11-04 15:12:08 +00:00
Felix Fietkau
f7ff1d6d0f fix a few issues with dynamically assigned interfaces
SVN-Revision: 8765
2007-09-12 17:02:34 +00:00
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
2007-08-21 18:23:57 +00:00
Felix Fietkau
b085680b96 tab/whitespace fix
SVN-Revision: 8338
2007-08-04 11:30:40 +00:00
Felix Fietkau
600d29f61e fix an error message
SVN-Revision: 8109
2007-07-22 18:46:57 +00:00
Felix Fietkau
b13426e21b keep track of the wifi interface state in /var/state/wireless
SVN-Revision: 8108
2007-07-22 18:32:47 +00:00
Felix Fietkau
e58d9626f2 add a workaround for the hostapd killed issue when using more than one wifi card (#1928, #2040)
SVN-Revision: 8077
2007-07-20 16:11:46 +00:00