Author: hawk Date: Sat Dec 3 16:33:40 2005 New Revision: 6583 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - clear net_{prefix,gateway,dns} if dhcp was selected - 68 chars for controller name in hostadapter selection dialog
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard ============================================================================== --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Sat Dec 3 16:33:40 2005 @@ -132,14 +132,14 @@ autoscsimods=`detect-pci-devices scsi -i | sort -u` for entry in $autoscsimods; do module=`echo $entry | awk -F "|" '{print $1}'` - name=`echo $entry | awk -F "|" '{printf "%.72s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.68s",$2}'` echo "<item id=$module checked=0>$name" done autoidemods=`detect-pci-devices ide -i | sort -u` for entry in $autoidemods; do module=`echo $entry | awk -F "|" '{print $1}'` - name=`echo $entry | awk -F "|" '{printf "%.72s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.68s",$2}'` echo "<item id=$module checked=0>$name" done @@ -610,6 +610,11 @@ } post_netip () { + if test "x$net_ipaddr" = "xdhcp"; then + net_prefix="" + net_gateway="" + net_dns="" + fi } ### _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit