[SCM] Debian Live initramfs hook branch, master, updated. 1.139.1-3-14-gbb27306

[Chris Lamb]

The following commit has been merged in the master branch:
commit 6f6e2071846e283b3cedc83099eb43f61e7f22e4
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Oct 1 00:56:30 2008 +0100

    Use "grep -qs" over "grep -q" for compatibility (see grep(1))
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/scripts/live-bottom/06hostname b/scripts/live-bottom/06hostname
index 75ea801..ba71fce 100755
--- a/scripts/live-bottom/06hostname
+++ b/scripts/live-bottom/06hostname
@@ -32,7 +32,7 @@ log_begin_msg "Setting hostname"
 # live-initramfs script
 
 # Change hostname only if it is not set
-if [ ! -f /root/etc/hostname ] || grep -q localhost\.localdomain /root/etc/hostname
+if [ ! -f /root/etc/hostname ] || grep -qs localhost\.localdomain /root/etc/hostname
 then
 	echo "${HOSTNAME}" > /root/etc/hostname
 else
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 2dba37a..f38eee7 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -33,7 +33,7 @@ log_begin_msg "Configuring fstab"
 # live-initramfs script
 
 # Create a fake fstab only if it is not already there
-if [ ! -f "${FSTAB}" ] || grep -q 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
+if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
 then
 	cat >> ${FSTAB} << EOF
 # /etc/fstab: static file system information.

-- 
Debian Live initramfs hook