x86: better rootfs handling
This commit is contained in:
Matthias Schiffer
parent
6f1594666d
commit
22b14a5f54
|
|
@ -0,0 +1,70 @@
|
|||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Sun, 15 Mar 2015 18:06:49 +0100
|
||||
Subject: firmware-utils: allow passing a specific MBR signature to ptgen
|
||||
|
||||
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
|
||||
|
||||
diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c
|
||||
index 0247fd0..6379ed7 100644
|
||||
--- a/tools/firmware-utils/src/ptgen.c
|
||||
+++ b/tools/firmware-utils/src/ptgen.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
#define cpu_to_le16(x) bswap_16(x)
|
||||
@@ -124,7 +125,7 @@ static inline unsigned long round_to_kb(long sect) {
|
||||
}
|
||||
|
||||
/* check the partition sizes and write the partition table */
|
||||
-static int gen_ptable(int nr)
|
||||
+static int gen_ptable(uint32_t signature, int nr)
|
||||
{
|
||||
struct pte pte[4];
|
||||
unsigned long sect = 0;
|
||||
@@ -159,6 +160,12 @@ static int gen_ptable(int nr)
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ lseek(fd, 440, SEEK_SET);
|
||||
+ if (write(fd, &signature, sizeof(signature)) != sizeof(signature)) {
|
||||
+ fprintf(stderr, "write failed.\n");
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
lseek(fd, 446, SEEK_SET);
|
||||
if (write(fd, pte, sizeof(struct pte) * 4) != sizeof(struct pte) * 4) {
|
||||
fprintf(stderr, "write failed.\n");
|
||||
@@ -187,8 +194,9 @@ int main (int argc, char **argv)
|
||||
char type = 0x83;
|
||||
int ch;
|
||||
int part = 0;
|
||||
+ uint32_t signature = 0x5452574F; /* 'OWRT' */
|
||||
|
||||
- while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vl:")) != -1) {
|
||||
+ while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vl:S:")) != -1) {
|
||||
switch (ch) {
|
||||
case 'o':
|
||||
filename = optarg;
|
||||
@@ -221,6 +229,9 @@ int main (int argc, char **argv)
|
||||
case 'l':
|
||||
kb_align = (int) strtoul(optarg, NULL, 0) * 2;
|
||||
break;
|
||||
+ case 'S':
|
||||
+ signature = strtoul(optarg, NULL, 0);
|
||||
+ break;
|
||||
case '?':
|
||||
default:
|
||||
usage(argv[0]);
|
||||
@@ -229,6 +240,6 @@ int main (int argc, char **argv)
|
||||
argc -= optind;
|
||||
if (argc || (heads <= 0) || (sectors <= 0) || !filename)
|
||||
usage(argv[0]);
|
||||
-
|
||||
- return gen_ptable(part);
|
||||
+
|
||||
+ return gen_ptable(signature, part);
|
||||
}
|
||||
|
|
@ -0,0 +1,180 @@
|
|||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Sun, 15 Mar 2015 17:01:32 +0100
|
||||
Subject: 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.
|
||||
|
||||
diff --git a/config/Config-images.in b/config/Config-images.in
|
||||
index 39e51e4..f44ec73 100644
|
||||
--- a/config/Config-images.in
|
||||
+++ b/config/Config-images.in
|
||||
@@ -267,8 +267,6 @@ menu "Target Images"
|
||||
config TARGET_ROOTFS_PARTNAME
|
||||
string "Root partition on target device"
|
||||
depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
|
||||
- default "/dev/xvda2" if TARGET_x86_xen_domu
|
||||
- default "/dev/sda2" if ! TARGET_x86_xen_domu
|
||||
help
|
||||
The root partition on the final device. If you don't know,
|
||||
you probably want the default (/dev/sda2).
|
||||
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 0bffbab..1d4873d 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
|
||||
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
|
||||
index a2dd20a..73ab5ef 100644
|
||||
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
|
||||
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
|
||||
@@ -1,16 +1,38 @@
|
||||
-x86_get_rootfs() {
|
||||
- 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
|
||||
-
|
||||
- echo "$rootfstype:$rootfsdev"
|
||||
+platform_export_bootpart() {
|
||||
+ local cmdline uuid disk
|
||||
+
|
||||
+ if read cmdline < /proc/cmdline; then
|
||||
+ case "$cmdline" in
|
||||
+ *block2mtd=*)
|
||||
+ disk="${cmdline##*block2mtd=}"
|
||||
+ disk="${disk%%,*}"
|
||||
+ ;;
|
||||
+ *root=*)
|
||||
+ disk="${cmdline##*root=}"
|
||||
+ disk="${disk%% *}"
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ case "$disk" in
|
||||
+ PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
|
||||
+ uuid="${disk#PARTUUID=}"
|
||||
+ uuid="${uuid%-02}"
|
||||
+ for disk in /dev/[hsv]d[a-z]; do
|
||||
+ set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
|
||||
+ if [ "$4$3$2$1" = "$uuid" ]; then
|
||||
+ export BOOTPART="${disk}1"
|
||||
+ return 0
|
||||
+ fi
|
||||
+ done
|
||||
+ ;;
|
||||
+ /dev/*)
|
||||
+ export BOOTPART="${disk%[0-9]}1"
|
||||
+ return 0
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+
|
||||
+ return 1
|
||||
}
|
||||
|
||||
platform_check_image() {
|
||||
@@ -26,19 +48,19 @@ platform_check_image() {
|
||||
}
|
||||
|
||||
platform_copy_config() {
|
||||
- local rootfs="$(x86_get_rootfs)"
|
||||
- local rootfsdev="${rootfs##*:}"
|
||||
-
|
||||
- mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
|
||||
- cp -af "$CONF_TAR" /mnt/
|
||||
- umount /mnt
|
||||
+ if [ -b "$BOOTPART" ]; then
|
||||
+ mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
|
||||
+ cp -af "$CONF_TAR" /mnt/
|
||||
+ umount /mnt
|
||||
+ fi
|
||||
}
|
||||
|
||||
platform_do_upgrade() {
|
||||
- local rootfs="$(x86_get_rootfs)"
|
||||
- local rootfsdev="${rootfs##*:}"
|
||||
+ platform_export_bootpart
|
||||
|
||||
- sync
|
||||
- [ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync
|
||||
- sleep 1
|
||||
+ if [ -b "${BOOTPART%[0-9]}" ]; then
|
||||
+ sync
|
||||
+ get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync
|
||||
+ sleep 1
|
||||
+ fi
|
||||
}
|
||||
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
|
||||
index 5983718..a0045a7 100644
|
||||
--- a/target/linux/x86/image/Makefile
|
||||
+++ b/target/linux/x86/image/Makefile
|
||||
@@ -40,7 +40,9 @@ ifneq ($(GRUB_TERMINALS),)
|
||||
GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS)
|
||||
endif
|
||||
|
||||
+SIGNATURE:=$(shell dd if=/dev/urandom bs=4 count=1 2>/dev/null | hexdump -v -e '"%02x"')
|
||||
ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
|
||||
+ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02)
|
||||
|
||||
GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT))
|
||||
|
||||
@@ -82,7 +84,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
|
||||
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
|
||||
-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
|
||||
./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
|
||||
- PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \
|
||||
+ PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
|
||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
|
||||
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh
|
||||
index 9d11efb..3fb31f6 100755
|
||||
--- a/target/linux/x86/image/gen_image_generic.sh
|
||||
+++ b/target/linux/x86/image/gen_image_generic.sh
|
||||
@@ -20,7 +20,7 @@ sect=63
|
||||
cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
|
||||
|
||||
# create partition table
|
||||
-set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN}`
|
||||
+set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}`
|
||||
|
||||
KERNELOFFSET="$(($1 / 512))"
|
||||
KERNELSIZE="$(($2 / 512))"
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
CONFIG_TARGET_x86=y
|
||||
CONFIG_TARGET_x86_kvm_guest=y
|
||||
CONFIG_TARGET_ROOTFS_PARTNAME="/dev/vda2"
|
||||
|
|
|
|||
Reference in New Issue