-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ooooops! used git format-patch and didn't check the From: line.... So it was me sending that previous mail, not Andre, sorry for that.
On 06/01/2014 05:17 AM, =?UTF-8?q?Andr=C3=A9=20Valentin?= wrote: > Signed-off-by: Daniel Golle <[email protected]> --- > package/base-files/files/lib/upgrade/common.sh | 32 > ++++++++++++++++---------- package/base-files/files/sbin/sysupgrade > | 17 ++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) > > diff --git a/package/base-files/files/lib/upgrade/common.sh > b/package/base-files/files/lib/upgrade/common.sh index 0207960..9549edb > 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ > b/package/base-files/files/lib/upgrade/common.sh @@ -111,18 +111,26 @@ > kill_remaining() { # [ <signal> ] # Skip kernel threads [ -n "$cmdline" ] > || continue > > - case "$name" in - # Skip essential > services - > *procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*) > > : ;; - - # Killable process - *) - if [ $pid -ne $$ ] && [ $ppid -ne > $$ ]; then - echo -n "$name " - > kill -$sig $pid 2>/dev/null - fi - > ;; - esac + if [ $$ -eq 1 ]; then + # > Running as init process, kill > everything except me + if [ $pid -ne $$ ]; then + > echo -n "$name " + > kill -$sig $pid 2>/dev/null + fi + else + > case "$name" in + # Skip > essential services + > *procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*) > > : ;; + + # Killable process + *) + if [ $pid -ne $$ ] && [ $ppid > -ne $$ ]; then + echo -n "$name > " + kill -$sig $pid 2>/dev/null > + fi + ;; + esac + > fi done echo "" } diff --git > a/package/base-files/files/sbin/sysupgrade > b/package/base-files/files/sbin/sysupgrade index cd224c6..01b170d 100755 > --- a/package/base-files/files/sbin/sysupgrade +++ > b/package/base-files/files/sbin/sysupgrade @@ -19,6 +19,7 @@ export > NEED_IMAGE= export HELP=0 export FORCE=0 export TEST=0 +export > ALL_ARGS="$*" > > # parse options while [ -n "$1" ]; do @@ -206,6 +207,22 @@ if [ $TEST -eq > 1 ]; then exit 0 fi > > +# should we inform procd to run this script +if [ $$ -ne 1 ]; then + . > /usr/share/libubox/jshn.sh + json_init + json_add_string pwd "$PWD" + > json_add_string command "/sbin/sysupgrade" + json_add_array arguments + > while [ $# -gt 0 ]; do + json_add_string "" "$1" + > shift + done + > json_close_array + ubus call system exec $(json_dump) + exit 0 +fi + > run_hooks "" $sysupgrade_pre_upgrade > > ubus call system upgrade > - -- ALLNET GmbH ; Maistr. 2 ; D-82110 Germering ; Germany Tel. +49-89-89422217 - Fax +49-89-89422233 http://www.allnet.de email: Daniel Golle <[email protected]> Schulungs-/Veranstaltungsprogramm: http://www.802lab.de<http://www.802lab.de/> Geschäftsführer: Wolfgang Marcus Bauer Handelsregister München B 95922 ; UST-ID-Nr. DE 128214294 ; St.-Nr.117/115/00164 WEEE-Reg.-NR. DE 13101093 Bankverbindung: Sparkasse Fürstenfeldbruck KTO: 2774594 ; BLZ: 70053070 Swift-Code: BYLADEM1FFB ; IBAN: DE61700530700002774594 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTirVrAAoJECBgbL4bcbCQ6MQIAIaOT5I+Mdp8QMZdnkgrqAdB nIK4Z9YLX5PHGIWpWdMPRVv1DAaxQiUC8K9QmsFJlz7Yy1MqPdswvOXflZIAzGLT H7oBxNfuqliT2o+W5ULujDr4ZGd6x/C41kIRBfe8TiCQazB4ylgeAknVx+4Dr8xf yohLEEKpTmSufnQZF1G2HYd8+46sKC1hlYdpBhl+fmiYQBgSq56QqRc5Iemw1d8s 5o362HuccW5iXkNc+JM1wr/9xlYto+TApS/5N3fQRp0N1GM9KhVYLmhgn6cnlDrr VQGsqJwX5RxpGnRUHXRJX8xojFHDJdAFwu8X5v4cLU70XGCRKw4IzH8oCwE8WOs= =OnkQ -----END PGP SIGNATURE----- _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
