hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt/target/linux/x86/base-files/lib/preinit/79_move_config

20 lines
396 B
Plaintext
Raw Normal View History

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: generalize partition discovery for sysupgrade Generalize the partition discovery in sysupgrade in order to fix sysupgrade and config backup/recovery on MMC block devices which use a different naming scheme compared to mtdblock or sd* devices. The change also adds the find applet to the ramdisk utilities so that upgrade code can rely on it. The commit is based on the initial submission by Russell Senior at http://patchwork.ozlabs.org/patch/625440/ . Signed-off-by: Russell Senior <russell@personaltelco.net> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-05-24 10:07:02 +00:00
local partdev
base-files: export x86 platform upgrade functions to common.sh Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-12-31 17:06:37 +00:00
. /lib/upgrade/common.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
base-files: export x86 platform upgrade functions to common.sh Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-12-31 17:06:37 +00:00
if export_bootdevice && export_partdevice partdev 1; then
x86: keep /boot mounted for kexec Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-05-05 03:56:10 +00:00
mkdir -p /boot
x86: mount writable bootfs Mount boot file system with rw option to allow installation of packages which install files to /boot directory. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2018-11-20 16:20:40 +00:00
mount -t ext4 -o rw,noatime "/dev/$partdev" /boot
treewide: don't hardcode "sysupgrade.tgz" file name 1) Add BACKUP_FILE and use it when copying an archive to be restored after sysupgrade (on the next preinit). 2) Use CONF_TAR for copying backup prepared by the /sbin/sysupgrade Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2019-09-04 14:57:39 +00:00
if [ -f "/boot/$BACKUP_FILE" ]; then
mv -f "/boot/$BACKUP_FILE" /
x86: move sysupgrade.tgz only if it exists To squash error messages at boot time mv: can't rename '/mnt/sysupgrade.tgz': No such file or directory Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-12-31 17:06:29 +00:00
fi
x86: make sysupgrade.tgz reachable again Moving binding mount before check for saved sysupgrade configuration made it unreachable. Fix it by moving binding mount after the check. Fixes: f78b2616 (x86: mount writable bootfs) Reported-by: Lucian Cristian <luci@powerneth.ro> Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
2018-11-28 19:44:21 +00:00
mount --bind /boot/boot /boot
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
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