diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 16:28:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 16:28:16 +0000 |
| commit | 953e8486362e29f50ea4f640dfc9c52c73862e30 (patch) | |
| tree | 9b24b24f6325131e30d8945e31c1627cd10db400 /target | |
| parent | 50f2e5e8e4f32af4e1d3d1da66cc052a1d61723c (diff) | |
| download | master-187ad058-953e8486362e29f50ea4f640dfc9c52c73862e30.tar.gz master-187ad058-953e8486362e29f50ea4f640dfc9c52c73862e30.tar.bz2 master-187ad058-953e8486362e29f50ea4f640dfc9c52c73862e30.zip | |
x86_64: initial support for PARTUUID
This change configures grub to mount the rootfs by PARTUUID instead of the
device path if CONFIG_TARGET_ROOTFS_PARTNAME is unset.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86_64/image/Makefile | 4 | ||||
| -rwxr-xr-x | target/linux/x86_64/image/gen_image_generic.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/x86_64/image/Makefile b/target/linux/x86_64/image/Makefile index c2f1ce9309..aacdab0ff6 100644 --- a/target/linux/x86_64/image/Makefile +++ b/target/linux/x86_64/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_64/image/gen_image_generic.sh b/target/linux/x86_64/image/gen_image_generic.sh index b4bf901fb4..711c755cf9 100755 --- a/target/linux/x86_64/image/gen_image_generic.sh +++ b/target/linux/x86_64/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))" |