projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dropping /etc/live.conf, replaced mostly by /etc/live/config.conf of live-config.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
5c6a82e
..
4eaf3a6
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-34,9
+34,6
@@
then
touch /etc/mtab
fi
touch /etc/mtab
fi
-[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME
-
. /scripts/live-helpers
if [ ! -f /live.vars ]
. /scripts/live-helpers
if [ ! -f /live.vars ]
@@
-1829,8
+1826,4
@@
mountroot ()
exec 2>&7 7>&-
kill ${tailpid}
[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
exec 2>&7 7>&-
kill ${tailpid}
[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
- if [ -f /etc/live.conf ]
- then
- cp /etc/live.conf "${rootmnt}/etc/"
- fi
}
}