projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
92-update-freshclam: do not error out on exit code 124 by freshclam.
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
30-fstab
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
index
6638878
..
850d2af
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/30-fstab
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/30-fstab
@@
-1,5
+1,5
@@
-#!/bin/sh
-# Filename:
/etc/grml/fai
/config/scripts/GRMLBASE/30-fstab
+#!/bin/
ba
sh
+# Filename:
${GRML_FAI_CONFIG}
/config/scripts/GRMLBASE/30-fstab
# Purpose: create initial /etc/fstab for use on live-system
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# Purpose: create initial /etc/fstab for use on live-system
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
@@
-14,10
+14,8
@@
USERNAME=''
[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
[ -n "$USERNAME" ] || USERNAME=grml
[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
[ -n "$USERNAME" ] || USERNAME=grml
-if [ -r /etc/grml/fai/files/etc/fstab ] ; then
- cp /etc/grml/fai/files/etc/fstab $target/etc/fstab
- sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab
-fi
+fcopy /etc/fstab
+sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab
## END OF FILE #################################################################
## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=
3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=
2