diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-24 10:08:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-24 10:08:12 +0000 |
| commit | 02e2548b844f987edab5fa82fb6283419f3381ff (patch) | |
| tree | b727f3d9cdcdc50318b9afbdb3699cbb05f4a466 /target/linux/x86/base-files/lib/preinit | |
| parent | 5d9eeab64aadb376a8c07d8faad44b25ac9ce7f5 (diff) | |
| download | upstream-02e2548b844f987edab5fa82fb6283419f3381ff.tar.gz upstream-02e2548b844f987edab5fa82fb6283419f3381ff.tar.bz2 upstream-02e2548b844f987edab5fa82fb6283419f3381ff.zip | |
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
Diffstat (limited to 'target/linux/x86/base-files/lib/preinit')
| -rw-r--r-- | target/linux/x86/base-files/lib/preinit/79_move_config | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config index 0bffbab994..1d4873d78b 100644 --- a/target/linux/x86/base-files/lib/preinit/79_move_config +++ b/target/linux/x86/base-files/lib/preinit/79_move_config @@ -1,21 +1,14 @@ #!/bin/sh -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2012-2015 OpenWrt.org move_config() { - local rootfsdev - local rootfstype - - rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)" - case "$rootfstype" in - squashfs|jffs2) - rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";; - ext4) - rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";; - esac + . /lib/upgrade/platform.sh - mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt - mv -f /mnt/sysupgrade.tgz / - umount /mnt + 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 |