Commit Graph

45 Commits (13700f454c9a802728bf6bc78cf305b00af4b80b)

Author SHA1 Message Date
John Crispin 321c5f3362 base-files: add support for platform_pre_upgrade function
Current NAND sysupgrade process is a bit hard to follow due to the way
of triggering stage1. Currently this is done by leaving a /mark/ in the
form of /tmp/sysupgrade-nand-path during nand_do_platform_check.
Existence of this mark stops standard sysupgrade process (as the result
of sysupgrade_pre_upgrade exit). This may be a bit misleading.

Proposed solution adds a new function that will allow platform.sh
trigger NAND sysupgrade consciously. This will also allow cleaning
nand_do_platform_check limiting it to just checking the image.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45338 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-09 14:33:03 +00:00
Imre Kaloz cfa0c5b27f [base-files]: fix sysupgrade on overlayfs v23+
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 15:55:52 +00:00
John Crispin 37a33d7e8d sysupgrade: preserve symlinks in backups
Signed-off-by: Catalin Patulea <catalinp@google.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42783 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-06 04:51:56 +00:00
John Crispin a0be38dafa procd: various cleanups to /lib/upgrade/nand.sh
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41222 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-16 18:55:14 +00:00
John Crispin 494257f5ab base-files: add an ugly hack for nand to sysupgrade
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41126 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:37 +00:00
Felix Fietkau 8ce376a524 /lib/functions.sh: move rarely used mtd and macaddr related functions to /lib/functions/system.sh
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40411 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:29:47 +00:00
John Crispin 1f0ac4101b sysupgrade: do not kill any processes in failsafe
sysugrade killed the lock causing failsafe to stop

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39318 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-17 22:12:05 +00:00
Luka Perkov d723a38780 [package] base-files: fix whitespaces
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39006 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-09 11:30:14 +00:00
Felix Fietkau 9383e3c3c4 ar71xx: Unifi AP Pro sysupgrade patch
The current implementation of mtd will not append the backup
file created by sysupgrade to the correct partition, as mtd will append
the data to first jffs2 partition it finds. As the kernel is also
stored on a jffs2 partition (which resides before the overlay
partition), the data will be appended to this partition.

To fix this problem, a new option

-s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to "0"

is added to mtd.

Signed-off-by: Peter Wagner <tripolar@gmx.at>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38807 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-14 19:38:54 +00:00
Jo-Philipp Wich 176af6bad9 base-files: implement -l (--list-backup) sysupgrade parameter to list the files that would be backed up
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37627 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 18:11:55 +00:00
Jo-Philipp Wich 7278ed6283 base-files: abort sysupgrade if file specified with --restore-config is not found
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37624 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 14:10:34 +00:00
Jo-Philipp Wich 6578d45c34 base-files: implement -T (--test) sysupgrade parameter to verify image without actually flashing it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37620 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-30 16:42:05 +00:00
John Crispin b21f877df0 sysupgrade: create state file so procd knows when a sysupgrade is in progress
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36893 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-10 08:24:31 +00:00
John Crispin 1940283948 mount_root: prepare base-files
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36429 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-25 19:02:32 +00:00
Jo-Philipp Wich ec20bc2d5d sysupgrade: clarify online help
Fixes #12346.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34975 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-02 16:21:30 +00:00
Jo-Philipp Wich 21df4e7130 sysupgrade: do not require an extra argument after --restore-backup
Neither --create-backup nor --restore-backup need an image name (following
the backup filename). Treat them in uniform way.

Mostly fixes #12346.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34974 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-02 16:21:26 +00:00
Jo-Philipp Wich b35dab3480 [package] base-files: provide a sysupgrade -r (--restore-backup) option as convenience wrapper for tar -C / -x(v)zf
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33147 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-12 13:20:27 +00:00
Jo-Philipp Wich 86c37ab542 [package] base-files: fix option parsing of -F/--force parameter
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33075 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-09 18:30:47 +00:00
Jo-Philipp Wich 75a299db50 [package] /etc/functions.sh => /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32062 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-05 16:04:23 +00:00
Jo-Philipp Wich e99cd67232 [package] base-files: implement a --force option for sysupgrade to override image checks, useful to upgrade old ar71xx installations to current trunk ones
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29688 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-08 15:30:37 +00:00
Jo-Philipp Wich ac4e466297 [package] base-files: add -b (--create-backup) option to sysupgrade, which generates a backup .tar.gz according to the user settings. This will also be reused by LuCI.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-12-20 17:25:15 +00:00
Jo-Philipp Wich 00a17bc44f [package] base-files: kill remaining processes after running user hooks (#10461)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29256 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-19 16:50:25 +00:00
Jo-Philipp Wich 1b7836ca8c [package] base-files: sysupgrade: kill all but essential processes before starting the update
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28626 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-27 16:52:31 +00:00
Jo-Philipp Wich 68e0aebc34 [package] base-files: add -h and --help options to sysupgrade (#9728)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27630 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-07-17 09:27:14 +00:00
Jo-Philipp Wich a81762a0b3 [package] base-files:
- add sysupgrade support for keepfile hints
		* introduces /lib/upgrade/keep.d/ for per-package keepfile lists
		* introduces /etc/sysupgrade.conf for user defined keepfile hints
	- prime /lib/upgrade/keep.d/base-files-essential to keep sysupgrade usable for images without opkg
	- change sysupgrade to build the keepfile list from /lib/upgrade/keep.d/, /etc/sysupgrade.conf and
	  opkg list-changed-conffiles


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23258 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 19:24:12 +00:00
Jo-Philipp Wich 3784ca2da7 [package] base-files: sysupgrade: merge info from "opkg list-changed-conffiles" to backup file list
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23233 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 07:40:25 +00:00
Jo-Philipp Wich a5bd37b0f6 [package] base-files: add an experimental "-c" flag which tries to preserve *all* changed files in /overlay/etc minus some system files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22977 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-09-07 22:20:26 +00:00
Travis Kemen 62fb99fe0e revert r19964 for now, there are issues with opkg/ipkg.py generating the status db
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19970 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-04 02:42:23 +00:00
Travis Kemen c4dd2d0542 grab all config files for installed packages, closes #3718
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19964 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-03 18:19:19 +00:00
Jo-Philipp Wich 8151a5f6da [package] base-files: sysupgrade: restrict find command to plain files to avoid duplicates when generating the conffiles tgz archive
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18455 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-11-20 23:02:35 +00:00
Jo-Philipp Wich 7488cbfa12 [package] base-files: add /etc/rc.local to the default save file list
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17572 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-09-12 15:57:31 +00:00
Vasilis Tsiligiannis a4fb93f134 [package] base-files: Fix sysupgrade .tar.gz configuration restoring
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16626 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-29 21:13:05 +00:00
Vasilis Tsiligiannis ef3d91790c [package] base-files: Detect and decompressed gzipped images automatically when flashing with sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16407 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-10 22:22:48 +00:00
Nicolas Thill 512f8bd6da [package] base-files: initialize GZIPED to 0 in sysupgrade since it's used later in numeric comparisons
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15890 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-17 11:54:44 +00:00
Jo-Philipp Wich bbc7a4c8c7 [sysupgrade] Don't try to pivot to new ramfs if already running on one
This patch allows the sysupgrade script to continue with the upgrade if
openwrt is already running on a ramfs. This allows the use of the sysupgrade
script as an _installer_ when running from an iso image. A user could boot the 
system from a bootable cd and invoke sysupgrade -n <URL> to write an image to
the hard disk or CF.

Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15683 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-07 13:51:45 +00:00
Jo-Philipp Wich f47863235d [PATCH] Add option in sysupgrade to flash gzipped images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15672 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-07 13:27:10 +00:00
Felix Fietkau c1b9ba6db4 add option in sysupgrade to restore config from file or URL (patch from #4043)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12772 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-28 19:45:59 +00:00
Felix Fietkau 57481bf020 fix typo from last sysupgrade commit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12715 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-26 08:58:43 +00:00
Travis Kemen 98daed4072 add switch to not save configuration over the reflash in noninteractive mode
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12714 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-26 00:10:01 +00:00
Felix Fietkau bd26d77953 sysupgrade: add optional delay before rebooting
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12572 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-12 19:51:30 +00:00
Travis Kemen 8c1abccd91 add /etc/firewall.user to be backed up becuase it is an example in /etc/config/firewall
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12326 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-16 18:01:18 +00:00
Travis Kemen 37708504cc remove /etc/firewall.* from being kept as they no longer are used in trunk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12320 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-16 16:04:51 +00:00
Travis Kemen 4de53e6237 keep /etc/group over reflash as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11919 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-07-24 16:36:39 +00:00
Travis Kemen 89a046fb86 add dropbear keys, passwd and firewall configuration to be saved during reflash
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11912 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-07-24 02:24:59 +00:00
Felix Fietkau fe9d7531d8 add sysupgrade script for config preserving system upgrades. only implemented for x86-2.6 at the moment, but can be ported to other platforms easily
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8456 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-08-21 18:23:57 +00:00