wok-6.x rev 13161

get-wifi-firmware: fix post_install
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jul 28 09:58:01 2012 +0200 (2012-07-28)
parents e8cae791f03f
children 91a13c17b446
files get-wifi-firmware/receipt linux/stuff/bootloader.sh
line diff
     1.1 --- a/get-wifi-firmware/receipt	Wed Jul 25 18:28:25 2012 +0200
     1.2 +++ b/get-wifi-firmware/receipt	Sat Jul 28 09:58:01 2012 +0200
     1.3 @@ -17,6 +17,10 @@
     1.4  
     1.5  post_install()
     1.6  {
     1.7 +	install_resolver=false
     1.8 +	[ -s /etc/resolv.conf -a ! -s $1/etc/resolv.conf ] && install_resolver=true
     1.9 +	$install_resolver && cp /etc/resolv.conf $1/etc/resolv.conf
    1.10  	# directly support some freely distributable firmware drivers 
    1.11  	chroot $1 /usr/bin/get-wifi-firmware --get-free-firmware
    1.12 +	$install_resolver && rm -f $1/etc/resolv.conf
    1.13  }
     2.1 --- a/linux/stuff/bootloader.sh	Wed Jul 25 18:28:25 2012 +0200
     2.2 +++ b/linux/stuff/bootloader.sh	Sat Jul 28 09:58:01 2012 +0200
     2.3 @@ -226,7 +226,7 @@
     2.4  		store 8 0x04A  $((2+2*$setupsz)) $bs	update displayinfo call
     2.5  	fi
     2.6  
     2.7 -	# Store cmdline after setup
     2.8 +	# Store cmdline after setup for kernels >= 0.99
     2.9  	if [ -n "$CMDLINE" ]; then
    2.10  		echo -n "$CMDLINE" | ddq bs=512 count=1 conv=sync >> $bs
    2.11  		CmdlineOfs=0x9E00	# Should be in 0x8000 .. 0xA000
    2.12 @@ -283,6 +283,10 @@
    2.13  	[ $PAD -ne 512 ] && ddq if=/dev/zero bs=1 count=$PAD >> $PREFIX
    2.14  	exit
    2.15  fi
    2.16 +[ $FORMAT -lt 1440 ] && store 8 0xEF  16	 $bs	1.2M
    2.17 +[ $FORMAT -lt 1200 ] && store 8 0xEF  10	 $bs	720K
    2.18 +[ $FORMAT -lt 360  ] && store 8 0xEF  9		 $bs	320K
    2.19 +[ $FORMAT -lt 320  ] && store 8 0xF8  2		 $bs	160K
    2.20  floppyset | split -b ${FORMAT}k /dev/stdin floppy$$
    2.21  i=1
    2.22  ls floppy$$* 2> /dev/null | while read file ; do