From 82d7f5f597d6c436ad00e8662fd436d7208863b0 2018-12-07 08:28:58 From: Yannick Schinko Date: 2018-12-07 08:28:58 Subject: [PATCH] Rename ENANLE_SWAP to ENABLE_DPHYSSWAP --- diff --git a/README.md b/README.md index fd0b552..d70c60b 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Set default system timezone. All available timezones can be found in the `/usr/s ##### `EXPANDROOT`=true Expand the root partition and filesystem automatically on first boot. -##### `ENABLE_SWAP`=true +##### `ENABLE_DPHYSSWAP`=true Enable swap. The size of the swapfile is chosen relative to the size of the root partition. It'll use the `dphys-swapfile` package for that. ##### `ENABLE_QEMU`=false diff --git a/bootstrap.d/50-firstboot.sh b/bootstrap.d/50-firstboot.sh index b8c31a3..57331ca 100644 --- a/bootstrap.d/50-firstboot.sh +++ b/bootstrap.d/50-firstboot.sh @@ -19,7 +19,7 @@ if [ "$EXPANDROOT" = true ] ; then cat files/firstboot/30-expandroot.sh >> "${ETC_DIR}/rc.firstboot" # Restart dphys-swapfile so the size of the swap file is relative to the resized root partition - if [ "$ENABLE_SWAP" = true ] ; then + if [ "$ENABLE_DPHYSSWAP" = true ] ; then cat files/firstboot/31-restart-dphys-swapfile.sh >> "${ETC_DIR}/rc.firstboot" fi else diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 2f90f95..fe4abdc 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -83,7 +83,7 @@ USER_PASSWORD=${USER_PASSWORD:=raspberry} DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"} TIMEZONE=${TIMEZONE:="Europe/Berlin"} EXPANDROOT=${EXPANDROOT:=true} -ENABLE_SWAP=${ENABLE_SWAP:=true} +ENABLE_DPHYSSWAP=${ENABLE_DPHYSSWAP:=true} # Keyboard settings XKB_MODEL=${XKB_MODEL:=""} @@ -486,7 +486,7 @@ if [ "$EXPANDROOT" = true ] ; then fi # Add dphys-swapfile package, required to enable swap -if [ "$ENABLE_SWAP" = true ] ; then +if [ "$ENABLE_DPHYSSWAP" = true ] ; then APT_INCLUDES="${APT_INCLUDES},dphys-swapfile" fi