# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1258970514 -3600
# Node ID b5013b460117cd9d0e0178ec47c338df4977d5f1
# Parent  4b16c8ec84b1b491931b3963dcf21a84b6a5d5f9
linux/boot: fix cmdline tail

diff -r 4b16c8ec84b1 -r b5013b460117 linux/stuff/bootloader.sh
--- a/linux/stuff/bootloader.sh	Sun Nov 22 17:34:55 2009 +0100
+++ b/linux/stuff/bootloader.sh	Mon Nov 23 11:01:54 2009 +0100
@@ -75,17 +75,16 @@
 	uudecode <<EOT | dd of=$bs conv=notrunc 2> /dev/null
 begin-base64 644 -
 v/Sd/GgAkAcxyQYXify7eACO2cU3sQbzpY7ZiSeMRwKg8X2YQAYfxkX4P/qX
-mEEw9jHb6FcBvgACgEwRgMdEJACcA3QO6GYBvigCORxyLkeLHFboQQFfizXo
-UgGwIOg+AbAIzRBOmM0WPAh0BZiJBEZGOzV08OgmATwKdd+5GABqAOL8ieaw
-D7/0Af5NHLEFtJOJRBywAYlEFJmJVBCJVBhmMdtD0+NLZgMdZtPraAAQB7+A
-ACn7nHMCAd9TVjHb6NQAXrkAgLSH/kQczRVbnXfcoRoCSL8cArEJOEQccrAx
-wM0T6gAAIJCwRijIvrkB6L0AXesjgPkTcgQ4wXdogP4CcgQ45ndpgP1Qc3Ng
-BlJRU5a0AlC5BgBRsQTBxQSwDyHoBJAnFEAn6HMA4u6wIM0QWeK0mM0TYTH2
-rZGtkq1QKMh3ArABmDn4cgKJ+FBStALNE1qVXlhynCn3AfHB5gkB8zjBdSaI
-yP7GsQE45nUciPS2AP7FPBN1EoD9UHINtQBgvrwB6CUAmM0WYaMEAFJRZo8G
-AAAJ/3WeFgewLrQOuwcAzRA8DXUOsArr8bAN6Oz/rAjAdfjDWDoASW5zZXJ0
-IG5leHQgZmxvcHB5IGFuZCBwcmVzcyBhbnkga2V5IHRvIGNvbnRpbnVlLgcN
-AA==
+mEEx2+hAAb4AAoBMEYDHRCQAnAN0DuhmAb4oAjkcci9HixxW6EIBX4s16FIB
+sCDNELAIzRBOmM0WPAh0BJiJBK07NXTx6CsBPAp14Yh8/rkYAGoA4vyJ5rAP
+v/QB/k0csQW0k4lEHLABiUQUmYlUEIlUGGYx20PT40tmAx1m0+toABAHv4AA
+KfuccwIB31NWMdvo1ABeuQCAtIf+RBzNFVudd9yhGgJIvxwCsQk4RBxysDHA
+zRPqAAAgkLBGKMi+twHovABd6yOA+RNyBDjBd2iA/gJyBDjmd2mA/VBzc2AG
+UlFTlrQCULkGAFGxBMHFBLAPIegEkCcUQCfodQDi7rAgzRBZ4rSYzRNhMfat
+ka2SrVAoyHcCsAGYOfhyAon4UFK0As0TWpVeWHKcKfcB8cHmCQHzOMF1JojI
+/saxATjmdRyI9P7FtgA8E3USgP1Qcg21AGC+ugHoJACYzRZhowQAUlFmjwYA
+AAn/dZ4WB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w1g6AEluc2VydCBu
+ZXh0IGZsb3BweSBhbmQgcHJlc3MgYW55IGtleSB0byBjb250aW51ZS4HDQA=
 ====
 EOT
 
diff -r 4b16c8ec84b1 -r b5013b460117 linux/stuff/linux-header-2.6.30.6.u
--- a/linux/stuff/linux-header-2.6.30.6.u	Sun Nov 22 17:34:55 2009 +0100
+++ b/linux/stuff/linux-header-2.6.30.6.u	Mon Nov 23 11:01:54 2009 +0100
@@ -18,7 +18,7 @@
  
  #ifndef SVGA_MODE
  #define SVGA_MODE ASK_VGA
-@@ -39,53 +41,392 @@
+@@ -39,53 +41,391 @@
  #define ROOT_RDONLY 1
  #endif
  
@@ -107,7 +107,6 @@
 +	xchg	%ax, %di		# sector count
 +	cbw				# limits = 0
 +	incw	%cx			# cylinder 0, sector 1
-+	xorb	%dh, %dh		# head 0, current drive
 +	xorw	%bx, %bx
 +	call	read_first_sectors	# read setup
 +
@@ -137,7 +136,7 @@
 +	call	puts
 +cmdlp:
 +	movb	$32, %al		# clear end of line
-+	call	putc			#  with Space
++	int	$0x10			#  with Space
 +	movb	$8, %al			#   and BackSpace
  	int	$0x10
 -	jmp	msg_loop
@@ -149,14 +148,14 @@
 +	je	cmdbs
 +	cbw
 +	movw	%ax, (%si)		# store end of string too
-+	incw	%si
-+	incw	%si
++	lodsw				# %si += 2
 +cmdbs:
 +	cmpw	(%di), %si		# lower limit is checked
 +	je	cmdget			#   but upper limit not
-+	call	putc
++	call	putc			# set %ah and %bx
 +	cmpb	$10, %al		# Enter ?
 +	jne	cmdlp
++	movb	%bh,-2(%si)		# remove CR
 +endcmdline:
 +	
 +nocmdline:
@@ -374,9 +373,10 @@
 +        cmpb    %cl,%dh			# reach head limit ?
 +        je	bdendlp
 +#endif
-+        movb    $0,%dh			# first head
 +# NOTE : support 256 cylinders max
 +        incb    %ch			# next cylinder
++read_first_sectors:
++        movb    $0,%dh			# first head
 +#ifndef FLOPPY_1440K_ONLY
 +	cmpb	$FLOPPY_SECTORS+1,%al	# 1.44M floppy ?
 +        jne	bdendlp
@@ -393,7 +393,6 @@
 -	int	$0x19
 +	popaw
 +bdendlp:
-+read_first_sectors:
 +#ifndef FLOPPY_1440K_ONLY
 +	movw	%ax, limits
 +#endif
@@ -405,15 +404,16 @@
 +        jne	read_sectorslp
 +	pushw	%ss
 +	popw	%es			# restore es
-+	movb	$0x2e, %al 		# loading... message 2e = .
++	movb	$0x2e+3, %al 		# 2e = .
++putclf:
++	subb	$3, %al
 +putc:
 +	movb	$0xe, %ah
 +	movw	$7, %bx			#   one dot each 64k
 + 	int	$0x10
 +	cmp	$0xd, %al		# CR ?
-+	jne	return
-+	movb	$0xa, %al		# LF
-+	jmp	putc
++	je	putclf
++	ret
  
 -	# int 0x19 should never return.  In case it does anyway,
 -	# invoke the BIOS reset code...
@@ -425,7 +425,6 @@
 +	lodsb
 +	orb	%al,%al			# end of string is \0
 +	jnz	putcs
-+return:
 +	ret
  
 -	.section ".bsdata", "a"