X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=e77c88b9b1ab25b14908061a8befeec2de295547;hb=1745eb3e9c7b078df115837f0acee6397b57dcb5;hp=16a2d0cd4c99c17a097fa5c5e2636e818e856c36;hpb=fa4e3b7531b58edc082487cba75f772121a21201;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 16a2d0c..e77c88b 100755
--- a/hooks/live
+++ b/hooks/live
@@ -24,11 +24,28 @@ esac
 
 # live-boot hook
 
+# Reading configuration file from filesystem
+if [ -e /etc/live/boot.conf ]
+then
+	. /etc/live/boot.conf
+fi
+
+if ls /etc/live/boot.conf.d/* > /dev/null 2>&1
+then
+	for _FILE in /etc/live/boot.conf.d/*
+	do
+		. ${_FILE}
+	done
+fi
+
 # Handling live-boot
 
 # Configuration
-mkdir -p "${DESTDIR}"/usr/share/live-boot
-cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
+if [ -e /usr/share/live-boot/languagelist ]
+then
+	mkdir -p "${DESTDIR}"/usr/share/live-boot
+	cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
+fi
 
 # Directories
 mkdir -p "${DESTDIR}"/lib/live-boot
@@ -44,7 +61,7 @@ cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-	if [ ! -e "${DESTDIR}"/"${FILE}" ]
+	if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
 	then
 		cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
 	fi
@@ -223,3 +240,14 @@ then
     manual_add_modules iscsi_tcp
     manual_add_modules crc32c
 fi
+
+if [ "${LIVE_DNS}" = "true" ]
+then
+	#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
+	copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
+	#copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
+
+	# Configuration file - may be needed if /etc/hosts is used.
+	#mkdir -p $DESTDIR/etc
+	#cp -p /etc/nsswitch.conf $DESTDIR/etc
+fi