exit 0
fi
-if [ -s ${FSTAB} ]
+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
+
+if ! grep -qs "^${UNIONTYPE}" "${FSTAB}"
then
- log_begin_msg "Not touching preexisting fstab..."
-else
- log_begin_msg "Configuring fstab..."
-
- cat >> ${FSTAB} <<-EOF
- # /etc/fstab: static file system information.
- #
- # <file system> <mount point> <type> <options> <dump> <pass>
- ${UNIONTYPE} / ${UNIONTYPE} rw 0 0
- tmpfs /tmp tmpfs nosuid,nodev 0 0
- EOF
+ echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${FSTAB}"
fi
-# live-initramfs script
+if ! grep -qs "^tmpfs /tmp" "${FSTAB}"
+then
+ echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
+fi
+
+if [ -z "${NOSWAP}" ]
+then
+ devices=""
+
+ for device in /dev/[hs]d[a-z][0-9]*
+ do
+ if ! [ -b "${device}" ]
+ then
+ continue
+ fi
+ /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | 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
+
+ if [ "${magic}" = "SWAPSPACE2" -o "${magic}" = "SWAP-SPACE" ]
+ then
+ #log "Found ${device}"
+ devices="${devices} ${device}"
+ 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
+ echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
+ done
+fi
# disabled for now
#rm -f /root/etc/rcS.d/S*checkroot.sh