Changeset 16488


Ignore:
Timestamp:
2009-06-17T13:09:10+02:00 (7 years ago)
Author:
jow
Message:

[package] sysupgrade: sync *before* mtd write, only fallback to sysrq-trigger if standard reboot fails

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

Legend:

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

    r16215 r16488  
    1010 
    1111PKG_NAME:=base-files 
    12 PKG_RELEASE:=22 
     12PKG_RELEASE:=23 
    1313 
    1414PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • trunk/package/base-files/files/lib/upgrade/common.sh

    r16408 r16488  
    143143 
    144144default_do_upgrade() { 
     145        sync 
    145146        if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then 
    146147                get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}" 
     
    148149                get_image "$1" | mtd write - "${PART_NAME:-image}" 
    149150        fi 
    150         sync 
    151151} 
    152152 
     
    158158                default_do_upgrade "$ARGV" 
    159159        fi 
    160          
     160 
    161161        [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { 
    162162                v "Refreshing partitions" 
     
    176176        ask_bool 1 "Reboot" && { 
    177177                v "Rebooting system..." 
     178                reboot 
     179                sleep 5 
    178180                echo b 2>/dev/null >/proc/sysrq-trigger 
    179                 reboot 
    180181        } 
    181182} 
Note: See TracChangeset for help on using the changeset viewer.