Magellan Linux

Diff of /mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall

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

revision 3271 by niro, Wed Sep 28 15:11:22 2011 UTC revision 8053 by niro, Wed Dec 30 10:18:24 2015 UTC
# Line 18  NEW_MAGE_UNINSTALL_TIMEOUT=0 Line 18  NEW_MAGE_UNINSTALL_TIMEOUT=0
18    
19  CONFIGRC="/etc/alxconfig-ng/config.rc"  CONFIGRC="/etc/alxconfig-ng/config.rc"
20  NEW_ALX_NETWORKING="dhcp"  NEW_ALX_NETWORKING="dhcp"
21  NEW_ALX_DHCP_PROG="/sbin/udhcpc"  NEW_ALX_DHCP_PROG="/sbin/dhcpcd"
22  NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"  NEW_ALX_DHCP_START="-t 10"
23  NEW_ALX_DHCP_STOP=""  NEW_ALX_DHCP_STOP="-k"
24  NEW_MIN_DISK_SPACE="85000"  NEW_MIN_DISK_SPACE="85000"
25  NEW_ALX_PLUGINS="/usr/lib/alxconfig-ng/plugins"  NEW_ALX_PLUGINS="/usr/lib/alxconfig-ng/plugins"
26  NEW_ALX_FUNCTIONS="/usr/lib/alxconfig-ng/functions"  NEW_ALX_FUNCTIONS="/usr/lib/alxconfig-ng/functions"
# Line 152  updateconfig RSYNC MIRRORS MAGE_DISTRIBU Line 152  updateconfig RSYNC MIRRORS MAGE_DISTRIBU
152  CONFIG="${CONFIGRC}"  CONFIG="${CONFIGRC}"
153  updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE ALX_PLUGINS ALX_FUNCTIONS  updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE ALX_PLUGINS ALX_FUNCTIONS
154    
155    # fix eth0 config too
156    CONFIG="/etc/conf.d/net.eth0"
157    eval "NEW_DHCP_PROG=\"${NEW_ALX_DHCP_PROG}\"" # eval this twice
158    eval "NEW_DHCP_PROG=\"${NEW_DHCP_PROG}\"" # to remove the \\ escapes
159    #
160    eval "NEW_DHCP_START=\"${NEW_ALX_DHCP_START}\"" # eval this twice
161    eval "NEW_DHCP_START=\"${NEW_DHCP_START}\"" # to remove the \\ escapes
162    #
163    eval "NEW_DHCP_STOP=\"${NEW_ALX_DHCP_STOP}\"" # eval this twice
164    eval "NEW_DHCP_STOP=\"${NEW_DHCP_STOP}\"" # to remove the \\ escapes
165    updateconfig DHCP_PROG DHCP_START DHCP_STOP
166    
167  # fix profile  # fix profile
168  if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]  if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]
169  then  then
# Line 337  then Line 349  then
349   # install an appropriate viafb.conf   # install an appropriate viafb.conf
350   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > /etc/modprobe.d/viafb.conf || die   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > /etc/modprobe.d/viafb.conf || die
351   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
352   echo "echo i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > /etc/modprobe.d/i810fb.conf || die   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > /etc/modprobe.d/i810fb.conf || die
353   # create an updated initrd   # create an updated initrd
354   DISKMODS="sd_mod"   DISKMODS="sd_mod"
355   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
# Line 349  then Line 361  then
361   case $(/usr/sbin/alx-hwdetection system) in   case $(/usr/sbin/alx-hwdetection system) in
362   zotac) FBMODS="" ;;   zotac) FBMODS="" ;;
363   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
364   maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer   maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb framebuffer
365   standard) FBMODS="uvesafb" ;;   standard) FBMODS="uvesafb" ;;
366   # unkown, use nothing to be safe   # unknown, use nothing to be safe
367   *) FBMODS="" ;;   *) FBMODS="" ;;
368   esac   esac
369   else   else
370   # unkown, use nothing to be safe   # unknown, use nothing to be safe
371   FBMODS=""   FBMODS=""
372   fi   fi
373   echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd   echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd

Legend:
Removed from v.3271  
changed lines
  Added in v.8053