Problems with udhcpc fixed (not optimal), some exclude stuff, to get the

proper *.o and avoid the general crowd of *.o from kernel etc...


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@512 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 37 insertions, 26 deletions

diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index 17dfee93..030bb850 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -120,3 +120,26 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \
     -i /mnt/etc/${D_SYSCONFDIR}/language
 }
 
+# check the glx stuff and configure it
+glxcheck () {
+case "${XMODULE}" in
+  radeon)
+    # check ${XDESC}/ hwsetup.info device string in Cards file and then
+    # for needed components
+    test -f /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
+      && test -f /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.* && { 
+         XMODULE=fglrx
+         # it only works for UnionFS enabled systems
+         ln -sf /mnt/usr/X11R6/lib/libGL.so.1.0.* \
+           /usr/X11R6/lib/libGL.so.1 2>/dev/null
+         }
+      # there seems no problem, if no TV is connected
+      #TVOUT='\tOption\t\t"TVFormat" "PAL-B"\n
+#\tOption\t\t"DesktopSetup" "horizontal"'
+  ;;
+  nv)
+    #
+    # test -f /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.*
+  ;;
+esac
+} 
diff --git a/initramfs/initrd-stuff/bin/dhcpmkconfig b/initramfs/initrd-stuff/bin/dhcpmkconfig
index ded4caaa..d32bd8e6 100755
--- a/initramfs/initrd-stuff/bin/dhcpmkconfig
+++ b/initramfs/initrd-stuff/bin/dhcpmkconfig
@@ -4,7 +4,7 @@
 # clients used within OpenSLX initramfs. The result is written in unified
 # form to the /etc/machine-setup file
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 03-09-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-11-2006
 # Lars Mueller, 23-06-2006
 # Oliver Tappe, 23-06-2006
 #
@@ -55,14 +55,15 @@ enabled via kernel command\n# line)." >>$cfgfile
   ;;
   *udhcpc*)
     dhcl="udhcpc"; echo -e "$cfgmsg\n$infomsg" >>$cfgfile
-    unset infomsg HOME IFS mask lease interface
+    # if $cfgfile is changed change target for set output accordingly
+    unset infomsg HOME IFS mask lease interface cfgmsg cfgfile
     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" \
-        >>$cfgfile
+        >>/tmp/confviadhcp
   ;;
 esac
 
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 9f647ff4..d1f86ca1 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -395,8 +395,9 @@ command line)." >> /etc/machine-setup
   # udhcpc is part of busybox
   udhcpc)
     [ -n $vci ] && vci="-V $vci"
-    ln -s /bin/dhcpmkconfig /bin/udhcpc.script
-    udhcpc -b -q $vci -s /bin/udhcpc.script -i eth0
+    testmkd /usr/share/udhcpc
+    ln -s /bin/dhcpmkconfig /usr/share/udhcpc/default.script
+    udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0
   ;;
   *)
   ;;
@@ -903,34 +904,20 @@ for i in boot.ld ${D_INITSCRIPTS}; do
   ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/K${revcnt}$i
 done
 }
-#############################################################################
-# find out if prerequisites for special X server modules are met (incomplete)
-checkglx () {
-case "${XMODULE}" in
-  radeon)
-    # check ${XDESC}/ hwsetup.info device string in Cards file and then
-    # for needed components
-    test -f /mnt/lib/modules/${KERNEL}/kernel/drivers/char/drm/fglrx.ko \
-      && test -f /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.* && \
-         XMODULE=fglrx
-      # there seems no problem, if no TV is connected
-      #TVOUT='\tOption\t\t"TVFormat" "PAL-B"\n
-#\tOption\t\t"DesktopSetup" "horizontal"'
-  ;;
-  nv)
-    #
-    # test -f /mnt/usr/X11R6/lib/modules/drivers/nvidia_drv.*
-  ;;
-esac
-}
 
 #############################################################################
 # dummy functions - avoid undefined functions in servconfig (functions are
 # normally overwritten by settings within distro-functions - a file generated
 # by slxmkramfs from <distro>/functions-default & ~-version
 
+# find out if prerequisites for special X server modules are met (distro
+# specific)
+checkglx () {
+:
+}
+
 # overwrite xorg configuration set by hwautocfg
-displayvars (){
+displayvars () {
 :
 }