diff options
Diffstat (limited to 'initrd/initrd-stuff/bin')
| -rwxr-xr-x | initrd/initrd-stuff/bin/dhcpmkconfig | 19 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig index 394de967..ca9a6412 100755 --- a/initrd/initrd-stuff/bin/dhcpmkconfig +++ b/initrd/initrd-stuff/bin/dhcpmkconfig @@ -4,9 +4,9 @@ # several dhcp clients. The result is written in unified form # to the /etc/machine-setup file # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006 -# Lars Mueller, 23-06-2006 -# Oliver Tappe, 23-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006 +# Lars Mueller, 23-06-2006 +# Oliver Tappe, 23-06-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg @@ -19,7 +19,7 @@ this is\n# intended, use dhclient instead or get them via tftp (to be \ enabled\n# via kernel command line)." case $0 in *dhcpcd*) - dhcl="dhcpcd"; echo -e "$infomsg" >>/etc/machine-setup + dhcl="dhcpcd"; echo -e "$infomsg" >>/tmp/confviadhcp sed -e "s,',\",g;s,IPADDR,clientip,;s,NETMASK,subnet_mask," \ -e "s,GATEWAY,gateway,;s,BROADCAST,broadcast_address," \ -e "s,HOSTNAME,host_name,;s,DOMAIN,domain_name," \ @@ -46,5 +46,16 @@ command\n# line)." >>/tmp/confviadhcp *pump*) dhcl="pump"; echo -e "$infomsg" >>/tmp/confviadhcp ;; + *udhcpc*) + dhcl="udhcpc"; echo -e "$infomsg" >>/tmp/confviadhcp + unset infomsg HOME IFS mask lease interface + set | sed \ + -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \ + -e "s,serverid,serverip,;s,subnet,subnet_mask," \ + -e "s,router,gateway,;s,hostname,host_name," \ + -e "s,dns,domain_name_servers,;s,domain,domain_name," \ + -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \ + >>/tmp/confviadhcp + ;; esac diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index c6fbf5d7..bc087964 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,7 +4,7 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006 # Felix Endres # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg @@ -90,6 +90,7 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n local DRI='\tGroup\t\t"video"\n \tMode\t\t0666' +# displayvars may overwrite the above settings displayvars if [ -n "$hw_graphic" ] ; then @@ -395,7 +396,8 @@ fi # not rather precise ... if strinfile "SCSI" /tmp/hwsetup.info ; then - strinfile "CDROM" /tmp/hwsetup.info && modprobe -a ${MODPRV} sr_mod sg + strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod; + modprobe ${MODPRV} sg; } strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod fi # fixme - psmouse entladen, falls nicht vorhanden |