diff options
Diffstat (limited to 'package/base-files/files/sbin')
| -rwxr-xr-x | package/base-files/files/sbin/firstboot | 33 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/mount_root | 26 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 38 |
3 files changed, 23 insertions, 74 deletions
diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot index 4da299189..081febb7b 100755 --- a/package/base-files/files/sbin/firstboot +++ b/package/base-files/files/sbin/firstboot @@ -1,34 +1,3 @@ #!/bin/sh -switch2jffs_hook= -jffs2reset_hook= -no_fo_hook= - -. /lib/functions/boot.sh - -firstboot_skip_next=false - -for fb_source_file in /lib/firstboot/*; do - . $fb_source_file -done - -set_mtd_part -set_rom_part -set_jffs_part - -# invoked as an executable -if [ "${0##*/}" = "firstboot" ]; then - if [ "$1" = "switch2jffs" ]; then - boot_run_hook switch2jffs - elif [ -n "$jffs" ]; then - reset_has_fo=true - echo "firstboot has already been run" - echo "jffs2 partition is mounted, only resetting files" - boot_run_hook jffs2reset - else - mtd erase "$partname" - mount "$mtdpart" /overlay -t jffs2 - fopivot /overlay /rom 1 - fi -fi - +/sbin/jffs2reset diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root deleted file mode 100755 index 2d73dac53..000000000 --- a/package/base-files/files/sbin/mount_root +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -# Initialize hook variables et by pulling in from preinit - -preinit_essential_hook= -preinit_main_hook= -failsafe_hook= -initramfs_hook= -preinit_mount_root= - -. /lib/functions/boot.sh - -for pi_source_file in /lib/preinit/*; do - . $pi_source_file -done - -# Override function that doesn't apply to use of mount_root as a command rather -# than as part of preinit - -preinit_echo() { - echo "$@" -} - -boot_run_hook preinit_mount_root diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 802848ade..1ad6ea44a 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -12,6 +12,7 @@ export DELAY= export CONF_IMAGE= export CONF_BACKUP= export CONF_RESTORE= +export NEED_IMAGE= export HELP=0 export FORCE=0 @@ -24,8 +25,8 @@ while [ -n "$1" ]; do -q) export VERBOSE="$(($VERBOSE - 1))";; -n) export SAVE_CONFIG=0;; -c) export SAVE_OVERLAY=1;; - -b|--create-backup) export CONF_BACKUP="$2"; shift;; - -r|--restore-backup) export CONF_RESTORE="$2"; shift;; + -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;; + -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;; -f) export CONF_IMAGE="$2"; shift;; -F|--force) export FORCE=1;; -h|--help) export HELP=1; break;; @@ -44,38 +45,41 @@ export CONF_TAR=/tmp/sysupgrade.tgz export ARGV="$*" export ARGC="$#" -[ -z "$ARGV" -a -z "$CONF_BACKUP" -o $HELP -gt 0 ] && { +[ -z "$ARGV" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && { cat <<EOF -Usage: $0 [options] <image file or URL> +Usage: $0 [<upgrade-option>...] <image file or URL> + $0 [-q] [-i] <backup-command> <file> -Options: +upgrade-option: -d <delay> add a delay before rebooting -f <config> restore configuration from .tar.gz (file or url) -i interactive mode -c attempt to preserve all changed files in /etc/ - -b / --create-backup <file> + -n do not save configuration over reflash + -F | --force + Flash image even if image checks fail, this is dangerous! + -q less verbose + -v more verbose + -h | --help display this help + +backup-command: + -b | --create-backup <file> create .tar.gz of files specified in sysupgrade.conf then exit. Does not flash an image. If file is '-', i.e. stdout, verbosity is set to 0 (i.e. quiet). - -r / --restore-backup <file> + -r | --restore-backup <file> restore a .tar.gz created with sysupgrade -b then exit. Does not flash an image. If file is '-', the archive is read from stdin. - -n do not save configuration over reflash - -F / --force - Flash image even if image checks fail, this is dangerous! - -q less verbose - -v more verbose - -h / --help display this help EOF exit 1 } -[ -n "$ARGV" -a -n "$CONF_BACKUP" ] && { +[ -n "$ARGV" -a -n "$NEED_IMAGE" ] && { cat <<-EOF - -b/--create-backup does not perform a firmware upgrade. Do not - specify both -b and a firmware image. + -b|--create-backup and -r|--restore-backup do not perform a firmware upgrade. + Do not specify both -b|-r and a firmware image. EOF exit 1 } @@ -175,6 +179,8 @@ fi run_hooks "" $sysupgrade_pre_upgrade +ubus call system upgrade + kill_remaining TERM sleep 3 kill_remaining KILL |