3 files changed, 3 insertions, 68 deletions
diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index 06b64c3..081febb 100755
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -1,44 +1,3 @@
 #!/bin/sh
 
-switch2jffs_hook=
-jffs2reset_hook=
-no_fo_hook=
-
-. /lib/functions.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
-    else
-	if [ -t 0 ] && [ "$1" != "-y" ]; then
-		local input
-
-		echo -n "firstboot will erase all settings and remove any installed packages. Are you sure? [N/y]"
-		read input
-		[ "$input" = "y" ] || [ "$input" = "Y" ] || return 0
-	fi
-
-	if [ -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 -o noatime "$mtdpart" /overlay -t jffs2
-	    fopivot /overlay /rom 1
-	fi
-    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 1c48eba..0000000
--- 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.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 6701930..1ad6ea4 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -179,6 +179,8 @@ fi
 
 run_hooks "" $sysupgrade_pre_upgrade
 
+ubus call system upgrade
+
 kill_remaining TERM
 sleep 3
 kill_remaining KILL