From 89e79c50c7e497dd7fa8eb5f451fbafa8abb72e6 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 7 Jun 2018 23:18:08 +0100
Subject: [PATCH] flash-images: Cleanup partitioning code

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/flash-images | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/lfs/flash-images b/lfs/flash-images
index cadae83d9f..4ed5da004c 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -69,33 +69,32 @@ else
  BOOTLOADER = grub
  S_OFFSET = 8192
 
- # Logical
+ # Linux
  PART_TYPE = L
 endif
 
+# /boot:  128MB - OFFSET
+# /    : 1200 MB
+S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
+S_ROOT := 2477600
+
 ifeq "$(EFI)" "1"
  S_EFI = 204800
 else
  S_EFI = 0
 endif
 
-# /boot:  128MB - OFFSET
-# /    : 1200 MB
-S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2477600
-
 PADDING = 100 # MB
 
 ifeq "$(EFI)" "1"
- SFDISK_EFI  = $(S_OFFSET),$(S_EFI),U\n
  SFDISK      = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
 else
- SFDISK_SWAP = ,0,0\n
- SFDISK      = $(SFDISK_BOOT)$(SFDISK_SWAP)$(SFDISK_ROOT)
+ SFDISK      = $(SFDISK_BOOT)$(SFDISK_ROOT)
 endif
 
-SFDISK_BOOT = $(shell echo $$(( $(S_OFFSET) + $(S_EFI) ))),$(S_BOOT),$(PART_TYPE),*\n
-SFDISK_ROOT = $(shell echo $$(( $(S_OFFSET) + $(S_EFI) + $(S_BOOT) ))),$(S_ROOT),L\n
+SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n
+SFDISK_EFI  = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) ))),$(S_EFI),U\n
+SFDISK_ROOT = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) ))),$(S_ROOT),L\n
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Stop if $(MNThdd) is still mounted
@@ -110,11 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Write Partition table
 	echo -e "$(SFDISK)" | sfdisk -uS $(DEVICE)
 
-	# Remove 2nd empty partition
-ifneq "$(EFI)" "1"
-	-echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE)
-endif
-
 	kpartx -v -a $(DEVICE)
 
 	# Format them
-- 
2.39.2