summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcomponents/3020-swap8
-rwxr-xr-xcomponents/9990-fstab.sh8
2 files changed, 8 insertions, 8 deletions
diff --git a/components/3020-swap b/components/3020-swap
index a1bcdbe..345b9a0 100755
--- a/components/3020-swap
+++ b/components/3020-swap
@@ -48,15 +48,15 @@ Swap ()
done
# Remove all auto swap entries
- if grep -qs "swap swap" /root/etc/fstab.d/swap
+ if grep -qs "swap swap" /root/etc/fstab
then
- grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp
- mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap
+ grep -v "swap swap" /root/etc/fstab > /root/etc/fstab.tmp
+ mv /root/etc/fstab.tmp /root/etc/fstab
fi
# Add new swap entries
for _DEVICE in ${_SWAP_DEVICES}
do
- echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap
+ echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab
done
}
diff --git a/components/9990-fstab.sh b/components/9990-fstab.sh
index 5ae9546..a8d9123 100755
--- a/components/9990-fstab.sh
+++ b/components/9990-fstab.sh
@@ -15,14 +15,14 @@ Fstab ()
log_begin_msg "Configuring fstab"
- if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab.d/live
+ if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab
then
- echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
+ echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
fi
- if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
+ if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
then
- echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
+ echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab
fi
log_end_msg