diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-17 10:21:15 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-21 10:32:53 +0100 |
| commit | a60fc1dbfa73a618caefd707538773517e19b886 (patch) | |
| tree | 72205f1685232fe098d659c57902b6cfa3740937 | |
| parent | 69bd78993a96e8ec37456fcb6727d5cca5d536f3 (diff) | |
| download | ptxdist-a60fc1dbfa73a618caefd707538773517e19b886.tar.gz ptxdist-a60fc1dbfa73a618caefd707538773517e19b886.tar.xz | |
image_hd: fix installing grub
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
(cherry picked from commit fe5a00f18ff141226a68917a29765b1ea7dd25f2)
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/post/image_hd.make | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_bootable.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rules/post/image_hd.make b/rules/post/image_hd.make index 2041238f1..1e529877c 100644 --- a/rules/post/image_hd.make +++ b/rules/post/image_hd.make @@ -36,7 +36,7 @@ ifdef PTXCONF_GRUB @echo "-----------------------------------" @echo "Making the image bootable with grub" @echo "-----------------------------------" - @ptxd_make_bootable $@ $(PTXCONF_IMAGE_HD_PART1_START) $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage1/stage2 + @ptxd_make_bootable $@ $(PTXCONF_IMAGE_HD_PART1_START) $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/stage2 endif ifdef PTXCONF_BAREBOX @echo diff --git a/scripts/lib/ptxd_make_bootable.sh b/scripts/lib/ptxd_make_bootable.sh index c702ef461..b32b4e3ee 100644 --- a/scripts/lib/ptxd_make_bootable.sh +++ b/scripts/lib/ptxd_make_bootable.sh @@ -25,7 +25,7 @@ ptxd_make_bootable() { local stage1="$3" local stage2="$4" local opt="conv=notrunc" - local opt2 + local opt2="seek=1" if [ ! -w "${image}" ]; then ptxd_bailout "Cannot write image file '${stage1}'" @@ -35,7 +35,7 @@ ptxd_make_bootable() { fi if [ -z "${stage2}" ]; then stage2="${stage1}" - opt2="${opt} seek=1 skip=1" + opt2="${opt2} skip=1" elif [ ! -r "${stage2}" ]; then ptxd_bailout "Cannot open stage2 file '${stage1}'" else |