From 7056e5ed29698513c5dbff791ccc81eab5687186 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Mon, 5 Feb 2007 23:38:50 +0000 Subject: Some cleanup for @@@serverip@@@ usage. Fixed debuglevel bug for debug=10. Just optic for xorg.conf in Gentoo ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@689 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'initramfs/initrd-stuff/init') diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index be761abe..53bdfefb 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -263,7 +263,7 @@ if [ "${DEBUGLEVEL}" -gt 0 -a "${DEBUGLEVEL}" != 8 ] ; then LOGFILE="/var/log/dxs-boot.log" echo "1 4 1 7" >/proc/sys/kernel/printk [ "${DEBUGLEVEL}" -ge 2 ] && MODPRV="-v" - [ "${DEBUGLEVEL}" -gt 3 -a "${DEBUGLEVEL}" -le 8 ] && { + [ "${DEBUGLEVEL}" -gt 3 -a "${DEBUGLEVEL}" -le 10 ] && { set -x # and the kernel too echo "7 7 7 7" >/proc/sys/kernel/printk; } @@ -324,6 +324,8 @@ if [ -n "$noipyet" ] ; then -o -z "$broadcast_address" ] && error "$init_errdhcp" ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0 fi +# check if serverip is set as variable @@@serverip@@@ +sed "s,@@@serverip@@@,$serverip," -i /etc/machine-setup [ $DEBUGLEVEL -eq 20 ] && echo "** finished ip config at $(sysup)" # ... or ldap if available (in background) [ -n "$ldap" ] && ldapconf & -- cgit v1.2.3-55-g7522