openwrtv3/target/linux/x86/base-files/lib/preinit/79_move_config

#!/bin/sh
# Copyright (C) 2012-2015 OpenWrt.org

move_config() {
	. /lib/upgrade/platform.sh

	if platform_export_bootpart; then
		mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
		mv -f /mnt/sysupgrade.tgz /
		umount /mnt
	fi
}

boot_hook_add preinit_mount_root move_config
Fix sysupgrade for squashfs, jffs2 and ext4 images * use 'fsync' with 'dd' for image writing * save config to boot partition SVN-Revision: 32465 2012-06-19 22:36:53 +00:00			`#!/bin/sh`
x86: use PARTUUID instead explicitly specifying the device by default This changes the x86 image generation to match x86_64, using the PARTUUID for the rootfs instead of explicitly configuring the device. It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2. Tested in QEMU/KVM with VirtIO, VirtualBox and VMware. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 44966 2015-03-24 10:08:12 +00:00			`# Copyright (C) 2012-2015 OpenWrt.org`
Fix sysupgrade for squashfs, jffs2 and ext4 images * use 'fsync' with 'dd' for image writing * save config to boot partition SVN-Revision: 32465 2012-06-19 22:36:53 +00:00
			`move_config() {`
x86: use PARTUUID instead explicitly specifying the device by default This changes the x86 image generation to match x86_64, using the PARTUUID for the rootfs instead of explicitly configuring the device. It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2. Tested in QEMU/KVM with VirtIO, VirtualBox and VMware. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 44966 2015-03-24 10:08:12 +00:00			`. /lib/upgrade/platform.sh`
Fix sysupgrade for squashfs, jffs2 and ext4 images * use 'fsync' with 'dd' for image writing * save config to boot partition SVN-Revision: 32465 2012-06-19 22:36:53 +00:00
x86: use PARTUUID instead explicitly specifying the device by default This changes the x86 image generation to match x86_64, using the PARTUUID for the rootfs instead of explicitly configuring the device. It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2. Tested in QEMU/KVM with VirtIO, VirtualBox and VMware. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> SVN-Revision: 44966 2015-03-24 10:08:12 +00:00			`if platform_export_bootpart; then`
			`mount -t ext4 -o rw,noatime "$BOOTPART" /mnt`
			`mv -f /mnt/sysupgrade.tgz /`
			`umount /mnt`
			`fi`
Fix sysupgrade for squashfs, jffs2 and ext4 images * use 'fsync' with 'dd' for image writing * save config to boot partition SVN-Revision: 32465 2012-06-19 22:36:53 +00:00			`}`

x86: fix sysupgrade Function move_config should be called after or during preinit_mount_root hook in do_mount_root function. At this state sysupgrade.tgz is not in its place during that time when do_mount_root is called. Function move_config is called later so the sysupgrade.tgz stays in root directory to the second restart when it is unpacked properly. This patch adds move_config function to preinit_mount_root hook instead of preinit_main and changes the filename of script to be called before 80_mount_root is called. It will prepare the sysupgrade archive for do_mount_root within preinit_mount_root hook. This patch solves ticket #15042 and #14088. Signed-off-by: Jiri Slachta <slachta@cesnet.cz> SVN-Revision: 39996 2014-03-21 15:55:07 +00:00			`boot_hook_add preinit_mount_root move_config`
Fix sysupgrade for squashfs, jffs2 and ext4 images * use 'fsync' with 'dd' for image writing * save config to boot partition SVN-Revision: 32465 2012-06-19 22:36:53 +00:00