# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1343462281 -7200
# Node ID 3ebbba73bb3f96f5d36f18f3d44b189e2a1742e8
# Parent  e8cae791f03f63f959f1f54d3412c06b40d97396
get-wifi-firmware: fix post_install

diff -r e8cae791f03f -r 3ebbba73bb3f get-wifi-firmware/receipt
--- a/get-wifi-firmware/receipt	Wed Jul 25 18:28:25 2012 +0200
+++ b/get-wifi-firmware/receipt	Sat Jul 28 09:58:01 2012 +0200
@@ -17,6 +17,10 @@
 
 post_install()
 {
+	install_resolver=false
+	[ -s /etc/resolv.conf -a ! -s $1/etc/resolv.conf ] && install_resolver=true
+	$install_resolver && cp /etc/resolv.conf $1/etc/resolv.conf
 	# directly support some freely distributable firmware drivers 
 	chroot $1 /usr/bin/get-wifi-firmware --get-free-firmware
+	$install_resolver && rm -f $1/etc/resolv.conf
 }
diff -r e8cae791f03f -r 3ebbba73bb3f linux/stuff/bootloader.sh
--- a/linux/stuff/bootloader.sh	Wed Jul 25 18:28:25 2012 +0200
+++ b/linux/stuff/bootloader.sh	Sat Jul 28 09:58:01 2012 +0200
@@ -226,7 +226,7 @@
 		store 8 0x04A  $((2+2*$setupsz)) $bs	update displayinfo call
 	fi
 
-	# Store cmdline after setup
+	# Store cmdline after setup for kernels >= 0.99
 	if [ -n "$CMDLINE" ]; then
 		echo -n "$CMDLINE" | ddq bs=512 count=1 conv=sync >> $bs
 		CmdlineOfs=0x9E00	# Should be in 0x8000 .. 0xA000
@@ -283,6 +283,10 @@
 	[ $PAD -ne 512 ] && ddq if=/dev/zero bs=1 count=$PAD >> $PREFIX
 	exit
 fi
+[ $FORMAT -lt 1440 ] && store 8 0xEF  16	 $bs	1.2M
+[ $FORMAT -lt 1200 ] && store 8 0xEF  10	 $bs	720K
+[ $FORMAT -lt 360  ] && store 8 0xEF  9		 $bs	320K
+[ $FORMAT -lt 320  ] && store 8 0xF8  2		 $bs	160K
 floppyset | split -b ${FORMAT}k /dev/stdin floppy$$
 i=1
 ls floppy$$* 2> /dev/null | while read file ; do