Commit Graph

58 Commits (1b4518a6b0bcdcf766cf88dac8e02c7de87e9f62)

Author SHA1 Message Date
Jo-Philipp Wich f061c95e51 procd: add support for relaying daemon stdio to syslog
Procd enabled init scripts can now specify:

  procd_set_param stdout 1
  procd_set_param stderr 1

... to relay their respective standard IO streams to the system log.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44547 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-26 13:42:47 +00:00
John Crispin 05ebabab10 procd: more nand takeover fixes
if the initramfs kernel and payload were flashed in one block, the payload might not be at the start of the ubi partition due to bad blocks inside the kernel partition.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43513 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-03 20:22:37 +00:00
John Crispin b049c3f4af procd: firstboot nand/ubi takeover support
it is now possible to flash a initramfs kernel and a sysupgrade tar file inside the ubi partition. on first boot, the takeover script will find the tar file, extract and finally sysupgrade it. this allows us to flash owrt/ubi images in a 2 phase setup using ODM webuis that are not ubi aware. this is needed by some mediatek and brokencom devices.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43505 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-03 14:32:32 +00:00
Rafał Miłecki c4c6ef099a procd: fix typo in nand.sh s/TRX/TAR/
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43423 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-28 19:13:24 +00:00
John Crispin b3fd443967 procd: fix/clean some conditions in nand.sh
1) nand_upgrade_tar: use a simpler condition that matches if () { }
   logic and fix check of $kernel_length variable
2) nand_do_upgrade_stage2: use case, otherwise one could believe we
   always call nand_upgrade_tar

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43373 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 19:14:29 +00:00
John Crispin b115a21948 procd: document nand.sh a bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43372 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 19:14:17 +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
Felix Fietkau 55fe29b1b9 procd: fix initial nand sysupgrade
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42884 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:50:15 +00:00
Felix Fietkau e7f7a8d1c5 procd: fix parsing of the has_env parameter
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42883 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:50:01 +00:00
John Crispin aacd95e1f5 procd: handle hotplug events for the usbmisc subsystem
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42831 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-08 08:00:01 +00:00
John Crispin cee0fdae00 procd: update to latest git
add support for starting services as !root

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42471 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-11 12:28:00 +00:00
Felix Fietkau 8b55a6de74 procd: allow adding empty strings to arrays
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42456 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-10 12:56:19 +00:00
John Crispin 381dc718a9 procd: run the mdns register outside the sub shell container
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42327 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-29 18:36:29 +00:00
John Crispin d6a4b8e232 procd: update to latest git HEAD
this adds a interafce.update trigger and mdns service registration helpers

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42324 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-29 18:16:24 +00:00
Felix Fietkau 1bc26661a1 procd: check output of "uci show" instead of raw config files in order to track uncommitted changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41865 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-29 02:12:24 +00:00
Imre Kaloz 44e7bc82d5 [procd]: allow overriding the kernel partition's name
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41646 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-14 14:53:15 +00:00
Imre Kaloz bd652ee268 [procd]: we already have a get_magic_long() in common.sh for sysupgrade, don't break it
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41628 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-13 20:51:17 +00:00
John Crispin 19594fc3ed procd: correctly identify ubifs in tar file
A missing path prevents the rootfs type contained in a SysupgradeNAND
tar file from being determined correctly.

This fixes it, and also corrects a minor spelling mistake.

Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-10 19:16:31 +00:00
Felix Fietkau 218ae8eb00 procd: add a shell helper function to emit a config.change event
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41482 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-02 19:18:20 +00:00
Felix Fietkau 42647b77cc procd: add shell functions to add instance data
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41481 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-02 19:18:16 +00:00
John Crispin 1a7223795f procd: fix uci_validation
Regardles of the return code from validate_data _error variable will be 0 due
to 'local' command in the previous line. With this patch we are able to catch
the return code from validate_data tool.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41414 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-30 09:57:29 +00:00
John Crispin fd4f6d5215 procd: fix nand.sh kernel_length typo
sysupgrade otherwise skips kernel part on devices which got
kernel in ubi due to kern_length being undefined, kernel_length
is being used instead.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41327 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:56 +00:00
John Crispin 87a9dcb506 procd: various improvements to nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41278 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-19 14:13:41 +00:00
John Crispin 31f99ff64c procd: some cleanup for SysupgradeNAND
Removed unused ubi file file from template as ubinized images are
passed directly and not inside the tarball.
Also removed left-over white-space.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41237 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-17 15:40:02 +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 1b895a65a4 procd: rename procd_add_network_trigger
i got complaints about the bad naming of the api. lets rename it while there are no users yet.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41220 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-16 18:55:05 +00:00
Felix Fietkau 5a1be6890b procd: allow passing multiple config files to procd_add_reload_trigger
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41146 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 17:05:46 +00:00
John Crispin 1d54844bf9 procd: update to latest git HEAD
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41129 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:49 +00:00
Felix Fietkau 4529f05113 procd: Fix USB cellular modems hotplug events
Without this patch, /etc/hotplug.d/tty/30-3g won't be called when you insert or remove a USB-serial cellular modem.

(see Ticket #14117)

Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41039 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-07 11:54:13 +00:00
John Crispin 16eceec6c4 procd: service instances can now report an error of why they failed to start.
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41031 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-06 09:34:30 +00:00
John Crispin b8e563d2d0 procd: add wrapper calls for interface triggers
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41008 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-05 10:56:06 +00:00
John Crispin 7024138581 procd: rename local variable in uci_validate_section
Allow to use "package", "type", "name", "error" and "result"
as config option names:

package some_service
config section 'foo'
    option name 'bar'
    option type 'unknown'

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41006 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-05 08:19:59 +00:00
Felix Fietkau 1abc9c63a2 procd: add a PROCD_DEBUG variable that will dump the ubus calls from init scripts to stderr
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39983 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-21 15:54:18 +00:00
John Crispin f97a3cfbe8 procd: the helper script did not export all functions properly
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39612 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-02-18 13:33:29 +00:00
John Crispin dba219f7c9 netifd: enable coredumps again
got broken due procd startup. Requires procd resource limit patch.

Signed-off-by: Ulrich Weber <uw@xyne.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39020 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-09 17:29:34 +00:00
Jo-Philipp Wich 8ad86b6a1e procd: fix processing of datatype specification with spaces
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38935 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-28 11:26:34 +00:00
John Crispin 944e1ee168 procd: update procd.sh to make use of the new validate_data tool
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38908 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-25 08:34:47 +00:00
Felix Fietkau a91d911f7d procd: emit tty events for ttyUSB* even when they come from the usb-serial subsystem
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38862 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-19 00:03:42 +00:00
John Crispin 5ff54b79ef procd: ubox: update to latest git head
move log service from procd to ubox
some debloating on procd
the preinit part of procd is now also a seperate binary

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38822 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-16 20:20:30 +00:00
John Crispin e41c835cee procd: options with default values are not parsed properly in the ubus register code
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38788 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-13 10:57:16 +00:00
John Crispin 57b91e4f39 procd: update to latest git head
this includes the first wip version of the uci validation backend

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38786 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-13 10:49:25 +00:00
Felix Fietkau 8326da8cf7 procd: reduce the number of unnecessary calls to /sbin/hotplug-call for tty devices
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38705 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-10 15:06:28 +00:00
John Crispin 18c8dafa90 procd: update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38529 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-24 14:27:03 +00:00
Felix Fietkau 1b44d4878e procd: fix command handling in procd_add_instance()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38350 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-09 11:07:23 +00:00
Luka Perkov cebf051302 [package] fix various init scripts
Changes include:

* removing unused variables
* replacing spaces with tabs where appropriate
* more consistency with variable declarations

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38142 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-23 21:58:36 +00:00
John Crispin d330d9fac4 procd: convert various packages to procd style init.d scripts
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38023 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-17 21:45:30 +00:00
John Crispin 021ff1b2d2 procd: update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38022 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-17 21:45:24 +00:00
Jo-Philipp Wich f69cb37291 procd: ensure the log_proto has udp default value in log.init
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37508 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-22 16:43:17 +00:00
Jo-Philipp Wich bd2cbce22c procd: default to udp log protocol to keep backwards compat with busybox
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37496 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-22 11:31:29 +00:00
John Crispin fa9a172e62 procd: make old button hotplug rules work until all packages are migrated
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37336 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-15 11:07:53 +00:00