From b7efa177bd05bf17d757d89195e5f0e4313759eb Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Tue, 1 Dec 2020 19:56:53 +0700 Subject: [PATCH] arm-rpi4, auto-resize: replace 91-edit-fstab-growfs into new feature --- features.in/arm-rpi4/config.mk | 5 ++--- features.in/auto-resize/README | 2 ++ features.in/auto-resize/config.mk | 3 +++ .../image-scripts.d/91-edit-fstab-growfs | 0 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 features.in/auto-resize/README create mode 100644 features.in/auto-resize/config.mk rename features.in/{arm-rpi4 => auto-resize}/image-scripts.d/91-edit-fstab-growfs (100%) diff --git a/features.in/arm-rpi4/config.mk b/features.in/arm-rpi4/config.mk index 49a8210b..7bf09288 100644 --- a/features.in/arm-rpi4/config.mk +++ b/features.in/arm-rpi4/config.mk @@ -1,8 +1,8 @@ ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (aarch64,$(ARCH)) -use/arm-rpi4: use/efi/grub use/uboot +use/arm-rpi4: use/efi/grub use/uboot use/auto-resize else -use/arm-rpi4: use/bootloader/uboot +use/arm-rpi4: use/bootloader/uboot use/auto-resize endif @$(call add_feature) @$(call set,VM_PARTTABLE,msdos) @@ -15,7 +15,6 @@ endif @$(call add,THE_PACKAGES,rpi4-boot-uboot-filetrigger) @$(call add,THE_PACKAGES,firmware-bcm4345) @$(call add,THE_PACKAGES,brcm-patchram-plus) - @$(call add,THE_PACKAGES,rpi4-resize-rootpart) @$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd-wait-online) use/arm-rpi4/x11: use/arm-rpi4 diff --git a/features.in/auto-resize/README b/features.in/auto-resize/README new file mode 100644 index 00000000..81f1f686 --- /dev/null +++ b/features.in/auto-resize/README @@ -0,0 +1,2 @@ +Эта фича включает авторасширение корневого раздела +при помощи systemd.growfs diff --git a/features.in/auto-resize/config.mk b/features.in/auto-resize/config.mk new file mode 100644 index 00000000..ad3b5c70 --- /dev/null +++ b/features.in/auto-resize/config.mk @@ -0,0 +1,3 @@ +use/auto-resize: + @$(call add_feature) + @$(call add,THE_PACKAGES,rpi4-resize-rootpart) diff --git a/features.in/arm-rpi4/image-scripts.d/91-edit-fstab-growfs b/features.in/auto-resize/image-scripts.d/91-edit-fstab-growfs similarity index 100% rename from features.in/arm-rpi4/image-scripts.d/91-edit-fstab-growfs rename to features.in/auto-resize/image-scripts.d/91-edit-fstab-growfs