X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=backend%2Finitramfs-tools%2Flive.hook;h=b37f54f41d137ff680df108bd93e27c68ea0d1db;hb=6cee205c9b6c7eb9c48bf66bfdd75ab04e38308c;hp=0e75e4d3232b5ea58dc64e2fac89707f78cbe264;hpb=6a5807fdd4cf67578a9715e17cbfc87c8c311955;p=live-boot-grml.git

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 0e75e4d..b37f54f 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -53,7 +53,7 @@ do
 done
 
 # udev dependencies
-if [ "${MINIMAL:-}" != "y" ]
+if [ "${MINIMAL:-}" != "true" ] &&  [ "${MINIMAL:-}" != "yes" ]
 then
 	for FILE in /lib/udev/*_id
 	do
@@ -61,7 +61,8 @@ then
 	done
 fi
 
-if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] && [ "${DISABLE_CDROM:-}" != "y" ]
+if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] && [ "${DISABLE_CDROM:-}" != "true" ] && \
+	[ "${DISABLE_CDROM:-}" != "yes" ]
 then
 	mkdir -p "${DESTDIR}/lib/udev/rules.d"
 	cp -p /lib/udev/rules.d/60-cdrom_id.rules "${DESTDIR}/lib/udev/rules.d"
@@ -106,7 +107,7 @@ manual_add_modules hfsplus
 # Filesystem: jffs2
 manual_add_modules jffs2
 
-if [ -x /usr/bin/rsync ] && [ "${MINIMAL:-}" != "y" ]
+if [ -x /usr/bin/rsync ] && [ "${MINIMAL:-}" != "true" ] && [ "${MINIMAL:-}" != "yes" ]
 then
 	copy_exec /usr/bin/rsync /bin
 fi
@@ -123,7 +124,7 @@ manual_add_modules aufs
 manual_add_modules overlay
 
 # Filesystem: vfat
-if [ "${DISABLE_FAT:-}" != "y" ]
+if [ "${DISABLE_FAT:-}" != "true" ] &&  [ "${DISABLE_FAT:-}" != "yes" ]
 then
 	manual_add_modules nls_cp437
 	manual_add_modules nls_iso8859-1
@@ -133,14 +134,14 @@ then
 fi
 
 # Filesystem: ntfs
-if [ "${DISABLE_NTFS:-}" != "y" ]
+if [ "${DISABLE_NTFS:-}" != "true" ] && [ "${DISABLE_NTFS:-}" != "yes" ]
 then
 	manual_add_modules ntfs
 fi
 
 [ "${QUIET}" ] || echo -n " devices"
 # Hardware: cdrom
-if [ "${DISABLE_CDROM:-}" != "y" ]
+if [ "${DISABLE_CDROM:-}" != "true" ] && [ "${DISABLE_CDROM:-}" != "yes" ]
 then
 	manual_add_modules ide-cd
 	manual_add_modules ide-generic
@@ -150,7 +151,7 @@ then
 fi
 
 # Hardware: usb
-if [ "${DISABLE_USB:-}" != "y" ]
+if [ "${DISABLE_USB:-}" != "true" ] && [ "${DISABLE_USB:-}" != "yes" ]
 then
 	manual_add_modules sd_mod
 fi
@@ -198,7 +199,7 @@ then
 fi
 
 # FUSE kernel module
-if [ "${DISABLE_FUSE:-n}" != "y" ]
+if [ "${DISABLE_FUSE:-n}" != "true" ] && [ "${DISABLE_FUSE:-n}" != "yes" ]
 then
 	manual_add_modules fuse
 
@@ -235,17 +236,19 @@ fi
 
 [ "${QUIET}" ] || echo -n " dns"
 
-# /lib/libnss_dns.so.*:a   DNS
-# /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
-# /lib/libnss_compat.so.*: /etc/passwd
+# libnss_dns.so.*:    DNS
+# libnss_files.so.*:  /etc/hosts and /etc/passwd
+# libnss_compat.so.*: /etc/passwd
 
-for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
+for _SHLIB in $(find /lib /usr/lib -name 'libnss_dns.so.*' -o -name 'libnss_files.so.*')
 do
 	copy_exec "${_SHLIB}"
 done
 
-# might be needed if /etc/hosts is used
-#mkdir -p "${DESTDIR}/etc"
-#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
+if [ ! -e "${DESTDIR}/etc/nsswitch.conf" ]
+then
+	# Needed to make "hostname -f" honor the domainname provided by DHCP
+	echo "hosts: files dns" > "${DESTDIR}/etc/nsswitch.conf"
+fi
 
 [ "${QUIET}" ] || echo .