Changeset 16489 for branches/8.09


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

[8.09] merge r16488

Location:
branches/8.09/package/base-files
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/base-files/Makefile

    r15321 r16489  
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=14.1 
     13PKG_RELEASE:=14.2 
    1414 
    1515PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • branches/8.09/package/base-files/files/lib/upgrade/common.sh

    r15868 r16489  
    135135 
    136136default_do_upgrade() { 
     137        sync 
    137138        if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then 
    138139                get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}" 
     
    140141                get_image "$1" | mtd write - "${PART_NAME:-image}" 
    141142        fi 
    142         sync 
    143143} 
    144144 
     
    150150                default_do_upgrade "$ARGV" 
    151151        fi 
    152          
     152 
    153153        [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { 
    154154                v "Refreshing partitions" 
     
    168168        ask_bool 1 "Reboot" && { 
    169169                v "Rebooting system..." 
     170                reboot 
     171                sleep 5 
    170172                echo b 2>/dev/null >/proc/sysrq-trigger 
    171                 reboot 
    172173        } 
    173174} 
Note: See TracChangeset for help on using the changeset viewer.