Changeset 39318


Ignore:
Timestamp:
2014-01-17T23:12:05+01:00 (4 years ago)
Author:
blogic
Message:

sysupgrade: do not kill any processes in failsafe

sysugrade killed the lock causing failsafe to stop

Signed-off-by: Alexander Couzens <lynxis@…>

Location:
trunk/package/base-files
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r38803 r39318  
    1212 
    1313PKG_NAME:=base-files 
    14 PKG_RELEASE:=149 
     14PKG_RELEASE:=150 
    1515 
    1616PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • trunk/package/base-files/files/sbin/sysupgrade

    r39006 r39318  
    211211touch /tmp/sysupgrade 
    212212 
    213 kill_remaining TERM 
    214 sleep 3 
    215 kill_remaining KILL 
     213if [ ! -f /tmp/failsafe ] ; then 
     214        kill_remaining TERM 
     215        sleep 3 
     216        kill_remaining KILL 
     217fi 
    216218 
    217219if [ -n "$(rootfs_type)" ]; then 
Note: See TracChangeset for help on using the changeset viewer.