Adding upstream version 4.0~a1.

[live-boot-grml.git] / scripts / boot / 9990-fstab.sh

diff --git a/scripts/boot/9990-fstab.sh b/scripts/boot/9990-fstab.sh
index 7f5459f..5ae9546 100755 (executable)
--- a/scripts/boot/9990-fstab.sh
+++ b/scripts/boot/9990-fstab.sh
@@ -6,32 +6,23 @@ Fstab ()
 {
        # FIXME: stop hardcoding overloading of initramfs-tools functions
        . /scripts/functions
-       . /lib/live/boot/initramfs-tools.sh
+       . /lib/live/boot/9990-initramfs-tools.sh
 
        if [ -n "${NOFSTAB}" ]
        then
                return
        fi
 
-       if [ -e /run ]
-       then
-               # wheezy
-               _FSTAB="/root/etc/fstab.d/live"
-       else
-               # squeeze
-               _FSTAB="/root/etc/fstab"
-       fi
-
        log_begin_msg "Configuring fstab"
 
-       if ! grep -qs  "^${UNIONTYPE}" "${_FSTAB}"
+       if ! grep -qs  "^${UNIONTYPE}" /root/etc/fstab.d/live
        then
-               echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${_FSTAB}"
+               echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
        fi
 
-       if ! grep -qs "^tmpfs /tmp" "${_FSTAB}"
+       if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
        then
-               echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${_FSTAB}"
+               echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
        fi
 
        log_end_msg