webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

flash-images: Cleanup partitioning code

Browse Source 
No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-06-07 23:18:08 +01:00
parent 8662e98173
commit 89e79c50c7
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lfs/flash-images
View File

@@ -69,33 +69,32 @@ else
BOOTLOADER = grub
S_OFFSET = 8192
# Logical
# Linux
PART_TYPE = L
endif
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
ifeq "$(EFI)" "1"
S_EFI = 204800
else
S_EFI = 0
endif
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