Magellan Linux

Diff of /trunk/hwinfo/emulate-hwsetup.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1198 by niro, Mon Nov 22 22:06:20 2010 UTC revision 1200 by niro, Mon Nov 22 22:59:53 2010 UTC
# Line 19  addconfig() Line 19  addconfig()
19   echo "${data}" >> ${HWSETUP_DIR}/${file}   echo "${data}" >> ${HWSETUP_DIR}/${file}
20  }  }
21    
22    echo -n "Autoconfiguring devices...  " 1>&2
23    
24  GFXCARD_INFO="$(${HWINFO} --gfxcard)"  GFXCARD_INFO="$(${HWINFO} --gfxcard)"
25  NETCARD_INFO="$(${HWINFO} --netcard)"  NETCARD_INFO="$(${HWINFO} --netcard)"
26  MOUSE_INFO="$(${HWINFO} --mouse)"  MOUSE_INFO="$(${HWINFO} --mouse)"
# Line 34  GFXCARD_XSERVER="Xorg" Line 36  GFXCARD_XSERVER="Xorg"
36  # network  # network
37  eval $(echo NETCARD_MODULE=\($(echo "${NETCARD_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))  eval $(echo NETCARD_MODULE=\($(echo "${NETCARD_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
38  eval $(echo NETCARD_DESC=\($(echo "${NETCARD_INFO}" | grep 'Model:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))  eval $(echo NETCARD_DESC=\($(echo "${NETCARD_INFO}" | grep 'Model:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
39    # fallback (only needed for systems without netlink)
40    eval $(echo NETCARD_MODULE_FB=\($(echo "${NETCARD_INFO}" | grep 'Driver Activation Cmd:' | sed 's:.*\:\ \"modprobe\ \(.*\)\"$:\"\1\":')\))
41  #  #
42  # mouse  # mouse
43  eval $(echo MOUSE_MODULE=\($(echo "${MOUSE_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))  eval $(echo MOUSE_MODULE=\($(echo "${MOUSE_INFO}" | grep 'Driver Modules:' | sed 's:.*\:\ \"\(.*\)\"$:\"\1\":')\))
# Line 61  do Line 65  do
65   then   then
66   GFXCARD_MODULE[${i}]="vesa"   GFXCARD_MODULE[${i}]="vesa"
67   fi   fi
   
68   addconfig xserver "XSERVER=\"${GFXCARD_XSERVER}\""   addconfig xserver "XSERVER=\"${GFXCARD_XSERVER}\""
69   addconfig xserver "XMODULE=\"${GFXCARD_MODULE[${i}]}\""   addconfig xserver "XMODULE=\"${GFXCARD_MODULE[${i}]}\""
70   addconfig xserver "XDESC=\"${GFXCARD_DESC[${i}]}\""   addconfig xserver "XDESC=\"${GFXCARD_DESC[${i}]}\""
# Line 74  done Line 77  done
77    
78  for ((i=0; i<NETCARD_COUNT; i++))  for ((i=0; i<NETCARD_COUNT; i++))
79  do  do
80     # use fallback
81     if [[ -z ${NETCARD_MODULE[${i}]} ]]
82     then
83     NETCARD_MODULE[${i}]="${NETCARD_MODULE_FB[${i}]}"
84     fi
85   addconfig netcard "FULLNAME=\"${NETCARD_DESC[${i}]}\""   addconfig netcard "FULLNAME=\"${NETCARD_DESC[${i}]}\""
86   addconfig netcard "DRIVER=\"${NETCARD_MODULE[${i}]}\""   addconfig netcard "DRIVER=\"${NETCARD_MODULE[${i}]}\""
87    
# Line 108  do Line 116  do
116   addconfig knoppix "MOUSE_DEVICE=\"${MOUSE_DEVICE[${i}]}\""   addconfig knoppix "MOUSE_DEVICE=\"${MOUSE_DEVICE[${i}]}\""
117   addconfig knoppix "MOUSE_DRIVER=\"${MOUSE_MODULE[${i}]}\""   addconfig knoppix "MOUSE_DRIVER=\"${MOUSE_MODULE[${i}]}\""
118  done  done
119    
120    echo "Done." 1>&2

Legend:
Removed from v.1198  
changed lines
  Added in v.1200