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 remote-tracking branch 'debian/debian' into ch/new_version
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
8761bd7
..
23d0bbc
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-730,12
+730,15
@@
do_netsetup ()
if [ -n "${DNSDOMAIN}" ]
then
echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
if [ -n "${DNSDOMAIN}" ]
then
echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
- echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ echo "search ${DNSDOMAIN}" >
>
/etc/resolv.conf
fi
for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
do
fi
for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
do
- echo "nameserver $i" >> /etc/resolv.conf
+ if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+ then
+ echo "nameserver $i" >> /etc/resolv.conf
+ fi
done
fi
done
fi
@@
-1473,8
+1476,8
@@
setup_unionfs ()
unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
- ( mkdir -p /dev/.initramfs/varrun
- pidof unionfs-fuse >> /
dev/.initramfs/varrun/sendsigs.omit
|| true )
+ ( mkdir -p /run/sendsigs.omit.d
+ pidof unionfs-fuse >> /
run/sendsigs.omit.d/unionfs-fuse
|| true )
;;
unionmount)
;;
unionmount)
@@
-1588,6
+1591,7
@@
check_dev ()
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+ fi
fi
fi
fi
fi
@@
-1941,6
+1945,13
@@
mountroot ()
log_end_msg
fi
log_end_msg
fi
+ if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+ then
+ log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+ cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+ log_end_msg
+ fi
+
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"