bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "system: don't attempt swapon/swapoff in inittab if not available"

Browse Source 
This reverts commit c4dce0ae0f.

A different fix will be provided in a forthcoming patch.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Carlos Santos
2020-02-07 19:33:21 -03:00
committed by Peter Korsgaard
parent 03a8884c46
commit ffb189ed5a
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/busybox/busybox.mk
View File

@@ -226,7 +226,6 @@ endif # BR2_TARGET_GENERIC_GETTY
BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY
BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
endif # BR2_INIT_BUSYBOX endif # BR2_INIT_BUSYBOX

1
package/sysvinit/sysvinit.mk
View File

@@ -45,6 +45,5 @@ endif # BR2_TARGET_GENERIC_GETTY
SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY
SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
$(eval $(generic-package)) $(eval $(generic-package))

13
system/system.mk
View File

@@ -96,19 +96,6 @@ define SYSTEM_REMOUNT_ROOT_INITTAB
endef endef
endif endif
define SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
if [ -x $(TARGET_DIR)/sbin/swapon ]; then \
$(SED) '\%:/sbin/swapon%s/^#*//' $(TARGET_DIR)/etc/inittab ; \
else \
$(SED) '\%:/sbin/swapon%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \
fi
if [ -x $(TARGET_DIR)/sbin/swapoff ]; then \
$(SED) '\%:/sbin/swapoff%s/^#*//' $(TARGET_DIR)/etc/inittab ; \
else \
$(SED) '\%:/sbin/swapoff%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \
fi
endef
ifeq ($(BR_BUILDING)$(BR2_SYSTEM_DEFAULT_PATH),y"") ifeq ($(BR_BUILDING)$(BR2_SYSTEM_DEFAULT_PATH),y"")
$(error BR2_SYSTEM_DEFAULT_PATH can't be empty) $(error BR2_SYSTEM_DEFAULT_PATH can't be empty)
endif endif