;;
esac
-# live-initramfs header
+# live-boot header
. /scripts/live-functions
log_begin_msg "Configuring fstab"
-# live-initramfs script
-
-# Create a fake fstab only if it doesn't exist or if its the debootstrap template
-if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
-then
-
-cat > ${FSTAB} << EOF
-# /etc/fstab: static file system information.
-#
-# <file system> <mount point> <type> <options> <dump> <pass>
-
-EOF
-
-fi
+# live-boot script
if ! grep -qs "^${UNIONTYPE}" "${FSTAB}"
then
echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
fi
-if [ -z "${NOSWAP}" ]
+if [ -n "${SWAPON}" ]
then
devices=""
continue
fi
- /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
+ /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
fi
done
+ # Remove all auto swap entries
+ if grep -qs "swap swap" "${FSTAB}"
+ then
+ grep -v "swap swap" "${FSTAB}" > "${FSTAB}".tmp
+ mv "${FSTAB}".tmp "${FSTAB}"
+ fi
+
+ # Add new swap entries
for device in ${devices}
do
- if ! grep -qs "^${device} swap" "${FSTAB}"
- then
- echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
- fi
+ echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
done
fi