From 80b8297c9eeaf041cc3aec549ebc938b33a82fe8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 17 Jun 2009 14:01:15 +0000
Subject: Suppress some unused variables in dhcp configuration, quieten wget
 ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2963 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/dhcpmkconfig | 3 ++-
 initramfs/stage3-stuff/init             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/stage3-stuff/bin/dhcpmkconfig b/initramfs/stage3-stuff/bin/dhcpmkconfig
index c8bf73d8..87e48683 100755
--- a/initramfs/stage3-stuff/bin/dhcpmkconfig
+++ b/initramfs/stage3-stuff/bin/dhcpmkconfig
@@ -21,7 +21,8 @@
   set -x
 
 echo -e "# network configuration written by $0:" >/tmp/confviadhcp
-unset infomsg HOME IFS mask lease interface cfgmsg cfgfile DEBUGLEVEL
+unset HOME IFS KCMDLINE DEBUGLEVEL MODPRV TERM BOOTIF BOOT_IMAGE \
+       infomsg mask lease interface cfgmsg cfgfile boot_file no_bootsplash
 set | sed \
   -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \
   -e "s,serverid,serverip,;s,subnet,subnet_mask," \
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index b250d043..fd15bd4c 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -711,7 +711,7 @@ fi
 [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
   echo "** Filesystem setup started at $(sysup)"
 # setup of client root filesystem dependent on the availability of UnionFS
-if [ -n "${union_type}" ] ; then
+if [ "x${union_type}" != "x" ] ; then
   echo "Using ${union_type} for rw access"
   mkdir -p ${rwdir}/union ${rwdir}/uniontmp /rorootfs
   # adapting tempfs size of the device directory (takes /tmp in stage4)
-- 
cgit v1.2.3-55-g7522