projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use $target/etc/resolvconf/run/resolv.conf
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
config
/
hooks
/
instsoft.GRMLBASE
diff --git
a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index
003e16a
..
63ae67d
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-17,7
+17,7
@@
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
- if [ -r /etc/resolvconf/run/resolv.conf ] ; then
+ if [ -r
$target
/etc/resolvconf/run/resolv.conf ] ; then
cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
else
cat /etc/resolv.conf >> $target/etc/resolv.conf
cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
else
cat /etc/resolv.conf >> $target/etc/resolv.conf