Transforming persistence_excludes bottom script into normal live-boot script.

[live-boot-grml.git] / initramfs-tools / scripts / live-bottom / 12fstab

diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
index 7f43937..871180c 100755 (executable)
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ b/initramfs-tools/scripts/live-bottom/12fstab
@@ -21,7 +21,9 @@ esac
 
 # live-boot header
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 if [ -n "${NOFSTAB}" ]
 then
@@ -42,48 +44,4 @@ then
        echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ -n "${SWAPON}" ]
-then
-       devices=""
-
-       for device in /dev/[hs]d[a-z][0-9]*
-       do
-               if ! [ -b "${device}" ]
-               then
-                       continue
-               fi
-
-               /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
-
-               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
-
-if [ "${NOFASTBOOT}" != "Yes" ]
-then
-       touch root/fastboot
-fi
-
 log_end_msg