projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lintian-fixes' into 'master'
[live-boot-grml.git]
/
components
/
9990-fstab.sh
diff --git
a/components/9990-fstab.sh
b/components/9990-fstab.sh
index
5ae9546
..
ba579de
100755
(executable)
--- a/
components/9990-fstab.sh
+++ b/
components/9990-fstab.sh
@@
-4,10
+4,6
@@
Fstab ()
{
Fstab ()
{
- # FIXME: stop hardcoding overloading of initramfs-tools functions
- . /scripts/functions
- . /lib/live/boot/9990-initramfs-tools.sh
-
if [ -n "${NOFSTAB}" ]
then
return
if [ -n "${NOFSTAB}" ]
then
return
@@
-15,14
+11,14
@@
Fstab ()
log_begin_msg "Configuring fstab"
log_begin_msg "Configuring fstab"
- if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab
.d/live
+ if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab
then
then
- echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
.d/live
+ echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
fi
fi
- if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
.d/live
+ if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
then
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
fi
log_end_msg