diff options
| author | Dirk von Suchodoletz | 2007-02-06 00:38:50 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-02-06 00:38:50 +0100 |
| commit | 7056e5ed29698513c5dbff791ccc81eab5687186 (patch) | |
| tree | 1886a30d5050c688e57d1f320117dfa9bfcbb4a6 /initramfs/initrd-stuff | |
| parent | Adjustments for Ubuntu 6.10 (diff) | |
| download | core-7056e5ed29698513c5dbff791ccc81eab5687186.tar.gz core-7056e5ed29698513c5dbff791ccc81eab5687186.tar.xz core-7056e5ed29698513c5dbff791ccc81eab5687186.zip | |
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
Diffstat (limited to 'initramfs/initrd-stuff')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 12 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 252659fa..02a32b40 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -294,8 +294,9 @@ case $ipcfg in MAC=$(ip link show dev $if|sed -n "/ether [0-9e-f]\{2\}:.*/p" \ | sed -e "s/.*ether //;s/ .*//") # if multicast is required for dnbd - [ -n "$nbdhost" ] && [ `echo $nbdhost|sed "s,\..*,,"` -ge 224 ] && \ - ip route add 224.0.0.0/4 dev eth0 + [ -n "$nbdhost" -a "$ip" != 127.0.0.1 ] && { nbdhost=$(checkip $nbdhost) + [ $(echo $nbdhost|sed "s,\..*,,") -ge 224 ] && \ + ip route add 224.0.0.0/4 dev $if; } ;; # traditional ifconfig/route - if a distro does not provide ip ifconfig) @@ -308,8 +309,9 @@ case $ipcfg in MAC=$(ifconfig $if|sed -n "/HWaddr [0-9A-F]\{2\}:.*/p" \ | sed -e "s/.*HWaddr //;y/ABCDEF/abcdef/") # if multicast is required for dnbd - [ -n "$nbdhost" ] && [ $(echo $nbdhost|sed "s,\..*,,") -ge 224 ] && \ - route add -net 224.0.0.0 netmask 240.0.0.0 dev $if + [ -n "$nbdhost" -a "$ip" != 127.0.0.1 ] && { nbdhost=$(checkip $nbdhost) + [ $(echo $nbdhost|sed "s,\..*,,") -ge 224 ] && \ + route add -net 224.0.0.0 netmask 240.0.0.0 dev $if; } ;; none) error "$error_iptool" @@ -628,8 +630,6 @@ if ! test -f /tmp/cfgcomplete ; then for config in /tmp/confviadhcp /tmp/confviafile /tmp/confvialdap do test -f $config && cat $config >> /etc/machine-setup done -# check if serverip is set as variable @@@serverip@@@ -sed "s,@@@serverip@@@,$serverip," -i /etc/machine-setup echo "config completed" > /tmp/cfgcomplete fi } 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 & |