# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1444378860 -7200
# Node ID bb00d1e3b0f74882b8ee3bf6da306ae2633d9c4d
# Parent  2c3b4f47fbf58e3d7e0ef09d1693df6d0e820406
Fix libs build, inet.conf updates ...

diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 base-tiny/receipt
--- a/base-tiny/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/base-tiny/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -9,7 +9,7 @@
 WEB_SITE="http://tiny.slitaz.org/"
 AUTO_SELECTION="always"
 CONFIG_FILES="/etc/network.conf /etc/rcS.conf /etc/passwd /etc/fstab \
-/root/.profile /etc/init.d/local.sh"
+/etc/inetd.conf /etc/daemons.conf /root/.profile /etc/init.d/local.sh"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 busybox/stuff/daemon
--- a/busybox/stuff/daemon	Wed Oct 07 10:53:41 2015 +0200
+++ b/busybox/stuff/daemon	Fri Oct 09 10:21:00 2015 +0200
@@ -9,7 +9,7 @@
 
 NAME=$(basename $0)
 DESC="$NAME deamon"
-DAEMON=$(which $NAME)
+DAEMON=$(which $NAME || echo $NAME)
 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
 PIDFILE=/var/run/$NAME.pid
 
@@ -39,6 +39,7 @@
 
 case "$1" in
   start)
+    [ $DAEMON != inetd ] &&
     grep -qs $DAEMON /etc/inetd.conf && active_inetd
     if active_pidfile $PIDFILE $NAME ; then
       echo "$NAME is already running."
@@ -51,6 +52,7 @@
     status
     ;;
   stop)
+    [ $DAEMON != inetd ] &&
     grep -qs $DAEMON /etc/inetd.conf && inactive_inetd
     if ! active_pidfile $PIDFILE $NAME ; then
       echo "$NAME is not running."
@@ -61,6 +63,7 @@
     status
     ;;
   restart)
+    [ $DAEMON != inetd ] &&
     grep -qs $DAEMON /etc/inetd.conf && exit 0
     if ! active_pidfile $PIDFILE $NAME ; then
       echo "$NAME is not running."
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 ftp-config/receipt
--- a/ftp-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/ftp-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -30,6 +30,6 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	grep -q /ftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
-ftp	stream	tcp	nowait	root	/usr/sbin/ftpd /usr/sbin/ftpd $ROOT
+ftp	stream	tcp	nowait	root	ftpd ftpd $ROOT
 EOT
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 gpxe/receipt
--- a/gpxe/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/gpxe/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -41,7 +41,7 @@
 	grep -q udhcpd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&udhcpd /' $1/etc/rcS.conf
 	grep -q tftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
-tftp	dgram	udp	wait	root	/usr/bin/tftpd /usr/bin/tftpd -r /usr/share/boot
+tftp	dgram	udp	wait	root	tftpd tftpd -r /usr/share/boot
 EOT
 	cat >> $1/etc/udhcpd.conf <<EOT
 opt  bootfile  gpxe.pxe
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 hardware-ibm-6272/receipt
--- a/hardware-ibm-6272/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/hardware-ibm-6272/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -19,7 +19,7 @@
 
 . /etc/init.d/rc.functions
 EOT
-	chmod +x $fs/etc/init.d/pnp.sh
+	chmod +x $1/etc/init.d/pnp.sh
 	cat >> $1/etc/init.d/pnp.sh <<EOT
 
 echo -n "Switching on cs89x0 isa pnp ethernet card "
@@ -51,7 +51,7 @@
 	sed -i 's/cs89x0[^ "]* //' $1/etc/rcS.conf
 	sed -i '/rm -f .sbin.*pnp/d' $1/etc/init.d/pnp.sh
 	[ "$CS89X0_WIPEPNP" == "on" ] &&
-	echo 'rm -f /sbin/pnpdump /sbin/isapnp' >> $1/etc/init.d/pnp.sh
+	echo 'rm -f /sbin/pnpdump /sbin/isapnp /etc/isapnp.conf' >> $1/etc/init.d/pnp.sh
 }
 
 config_form()
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 lan-config/receipt
--- a/lan-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/lan-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -48,7 +48,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $stuff/. $fs
+	cp -a $stuff/. $fs/
 }
 
 config_form()
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libcrypt/receipt
--- a/libcrypt/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libcrypt/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -11,9 +11,16 @@
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 WEB_SITE="http://tiny.slitaz.org/"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libdl/receipt
--- a/libdl/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libdl/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -11,9 +11,16 @@
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 WEB_SITE="http://tiny.slitaz.org/"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libgcc_s/receipt
--- a/libgcc_s/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libgcc_s/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -11,9 +11,16 @@
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 WEB_SITE="http://tiny.slitaz.org/"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libm/receipt
--- a/libm/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libm/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -11,9 +11,16 @@
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 WEB_SITE="http://tiny.slitaz.org/"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libtcc/receipt
--- a/libtcc/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libtcc/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -13,6 +13,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/lib/libtcc.a $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/lib/libtcc.a $fs/usr/lib
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 libutil/receipt
--- a/libutil/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/libutil/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -11,9 +11,16 @@
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 WEB_SITE="http://tiny.slitaz.org/"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 linux/stuff/bootloader.S
--- a/linux/stuff/bootloader.S	Wed Oct 07 10:53:41 2015 +0200
+++ b/linux/stuff/bootloader.S	Fri Oct 09 10:21:00 2015 +0200
@@ -17,9 +17,13 @@
 #endif
 
 /* Assume protocol 2.00+ (kernel >= 1.3.73) */
-/* feature set */
+
+/* basic support: zImage or bzImage, floppy parameters table patch, */
+/* any sectors/track count (720K, 1.2M, 1.44M floppy or 1.68M ...), */
+/* show progress (.), show errors (-) */
+
+/* extra feature set */
 #define EXE_SUPPORT		real mode dos .exe file support
-// #define EXE_ONLY		remove floppy code
 #define EXE_CMDLINE		kernel >= 2.4
 // #define FLOPPY_CMDLINE	kernel >= 2.4
 // #define OLDCMDLINE		kernel  < 2.4
@@ -28,8 +32,8 @@
 #define KEYBOARDLESS_SUPPORT	scan floppy swap each 5 seconds
 // #define FAT12_SUPPORT	will format the floppy free space in FAT 12
 // #define CHECK_REALMODE	exe dont crash when started in vm86
-// #define SINGLE_FLOPPY	Everything fit in a single floppy
-// #define EDIT_CMDLINE
+#define MULTI_FLOPPY		Everything may dont fit in a single floppy
+// #define EDIT_CMDLINE		Wait 5 seconds for the first key to edit it
 // #define MOVE_CMDLINE
 #define INITRD_SUPPORT
 // #define INITRD_AUTOADDR	Hole in 16Mb..32Mb
@@ -38,9 +42,21 @@
 // #define COUNTER		Show floppy number
 #define LABEL "SliTaz"
 
+/* remove from basic features */
+// #define EXE_ONLY		remove floppy code
+// #define NO_FLOPPY_TABLE_PATCH	remove floppy parameter table patch
+// #define NO_OUTPUT		remove output code
+
 	.code16
 	.org	0
 
+#ifdef NO_OUTPUT
+# undef DISPLAY_VERSION
+# undef README_SUPPORT
+# undef FLOPPY_CMDLINE
+# undef COUNTER
+#endif
+
 bootsect_start:
 
 cur_initrd_size_ofs	= 494
@@ -57,7 +73,11 @@
 
 
 stacktop	= 0x9E00		# in 0x8000 .. 0xA000
+#ifdef NO_FLOPPY_TABLE_PATCH
+zeroed		= 48+8			# gdt + zeroed registers
+#else
 zeroed		= 48+10			# gdt + zeroed registers
+#endif
 .macro	INIT_REGS
 	movw	$stacktop-zeroed, %di	# stacktop is an arbitrary value >=
 					# length of bootsect + length of
@@ -69,7 +89,7 @@
 	pushw	%ss
 	popw	%es			# %es = %ss = INITSEG
 	xorw	%ax, %ax		# %ax = 0
-#if defined(EXE_CMDLINE)
+#ifdef EXE_CMDLINE
 	movw	$zeroed+1, %cx		# clear gdt + offset, %ds, limits, cmdline=""
 	rep				# don't worry about cld
 	stosb				# already done above
@@ -115,7 +135,7 @@
 	.word	0			// Checksum
 	.word	EXEADRS(comstart)	// Initial IP value
 	.word	0xFFF0			// Initial (relative) CS value
-#if defined(EXE_ONLY) || defined(SINGLE_FLOPPY) || defined(COUNTER)
+#if defined(EXE_ONLY) || !defined(MULTI_FLOPPY) || defined(COUNTER)
 //	.word	0x001C			// File address of relocation table
 //	.word	0,0,0			// Overlay number
 	.ascii	"(SliTaz)"
@@ -144,7 +164,7 @@
 
 #if defined(EXE_SUPPORT) || defined(EXE_ONLY)
 A20BUFFER	= 0x68000		# a20 gate / himem.sys support
-#define USEA20BUFFER
+#define USEA20BUFFER			# Does not break zImage support
 #endif
  
 #ifndef EXE_ONLY
@@ -173,15 +193,26 @@
 # High doesn't hurt.  Low does.  Let's use the max: 63
 
 	cli
+#ifdef NO_FLOPPY_TABLE_PATCH
+	xchg	%ax, %di		# sector count
+	popw	%ax			# limits = 0
+	incw	%cx			# cylinder 0, sector 1, clear Z
+	call	read_first_sectors	# read setup
+# ifdef	FLOPPY_CMDLINE
+	movw	$0, %si			# patched by installer (7C22)
+skipcmdline:
+#define cmd_line_ptr	0x22
+# endif
+#else
 	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
 	popw	%di
 	pushw	%es
 	pushw	%di
-#ifdef	FLOPPY_CMDLINE
+# ifdef	FLOPPY_CMDLINE
 	movw	$0, %bp			# patched by installer (7C22)
 skipcmdline:
 #define cmd_line_ptr	0x22
-#endif
+# endif
 	movb	$6, %cl			# copy 12 bytes
 	rep				# don't worry about cld
 	  movsw				# already done above
@@ -194,6 +225,7 @@
 	popw	%ax			# limits = 0
 	incw	%cx			# cylinder 0, sector 1, clear Z
 	call	read_first_sectors	# read setup
+#endif
 #ifdef	README_SUPPORT
 	xorw	%si, %si
 	orw	readme, %si
@@ -275,7 +307,6 @@
 # possible, loading whole tracks whenever we can.
 
 .macro	autoaddr base
-#ifdef INITRD_AUTOADDR
 	movb	$0x88, %ah
 	int	$0x15
 	//jc	NeedMoreRAM			# error code 80 or 86
@@ -284,7 +315,6 @@
 	movb	%ch, bootsect_dst_base_hi(%si)	# initramfs @ 32M
 	movb	%ch, ramdisk_image_ofs+3-\base
 NeedMoreRAM:
-#endif
 .endm
 
 bootsect_src_limit	= 16
@@ -400,7 +430,9 @@
 	je	nextInitrd	
 	orw	%bx, %bx
 	je	bootit			# no initrd
+# ifdef INITRD_AUTOADDR
 	autoaddr	cur_initrd_size_ofs(%di)
+# endif
 	movw	ramdisk_image+1,%ax
 	jmp	initrdlp
 nextInitrd:
@@ -416,7 +448,9 @@
 #ifdef MORETHAN16M
 	cmpb	%cl, ramdisk_image+2-ramdisk_size(%bx)
 	jb	bootit
+# ifdef INITRD_AUTOADDR
 	autoaddr	ramdisk_size_ofs(%bx)
+# endif
 	movw	ramdisk_image+1,%ax
 	shrw	%cl, boot_flag-ramdisk_size(%bx)
 	jne	initrdlp
@@ -477,8 +511,8 @@
 #define FLOPPY_CYLINDERS	80	
 #define FLOPPY_HEADS		2	
 
+#if defined(MULTI_FLOPPY) && defined(COUNTER)
 .macro	putsmsg
-#if !defined(SINGLE_FLOPPY) && defined(COUNTER)
 	movw	$msgdigit+1-msg, %bx
 nextdigit:
 	andb	$0xF0, (%bx,%si)
@@ -486,9 +520,13 @@
 	incb	(%bx,%si)
 	cmpb	$'9', (%bx,%si)
 	ja	nextdigit
-#endif
 	call	puts
 .endm
+#else
+.macro	putsmsg
+	call	puts
+.endm
+#endif
 
 check_limits:
 	popw	%dx
@@ -496,8 +534,10 @@
         ja	next_head		#   no -> store it
 	pushaw
         int     $0x13			# reset controler
+#ifndef NO_OUTPUT
 	stc
 	call	putcdot			# print '-'
+#endif
 read_sectorslp:
 	popaw
 bdendlp:
@@ -540,7 +580,7 @@
         jne	bdendlp			# reach head limit ?
         incb    %ch			# next cylinder
 read_first_sectors:
-#ifdef SINGLE_FLOPPY
+#ifndef MULTI_FLOPPY
 	jmp	bdendlp
 #else
         cmpb    $FLOPPY_CYLINDERS,%ch	# reach cylinder limit ?
@@ -552,7 +592,9 @@
 dpy_swap_floppy:
 #ifdef KEYBOARDLESS_SUPPORT
 	pushw	%bx
+# ifndef NO_OUTPUT
 	putsmsg
+# endif
 	popw	%bx
 	movw	%si, %bp
 waitfloppy:
@@ -579,7 +621,9 @@
 	jne	waitfloppy
 waitfloppydone:
 #else
+# ifndef NO_OUTPUT
 	putsmsg
+# endif
 	cbw				# %ah = 0, get keyboard character
 	int	$0x16
 #endif
@@ -610,6 +654,7 @@
 #endif
 
 putcdot:
+#ifndef NO_OUTPUT
 	movb	$'.'+3, %al	// . = success, - = failure
 putclf:
 	sbbb	$3, %al
@@ -619,6 +664,8 @@
  	int	$0x10
 	cmp	$0xd, %al		# CR ?
 	je	putclf
+#endif
+dosexit:
 	ret
 
 #ifdef KEYBOARDLESS_SUPPORT
@@ -655,12 +702,10 @@
 	movw	$0x80, %si
 	movb	(%si), %cl
 	incw	%si
-# ifdef OLDCMDLINE
-#  ifdef FLOPPY_CMDLINE
+# if defined(OLDCMDLINE) && defined(FLOPPY_CMDLINE)
 	jcxz	nocmdline
 	movw	%di, EXEADRS(0x22)
 	movw	$0xA33F, 0x7F(%si)
-#  endif
 # endif
 	rep
 	  movsb
@@ -682,6 +727,9 @@
 # else
 	jne	dosexit				// real mode only...
 # endif
+	movb	$0x3D, %ah	// open, access = RO
+#else
+	movw	$0x3D00, %ax	// open, access = RO
 #endif
 	movw	0x2C(%bx), %ds	// DOS 3.0+
 loop1:
@@ -689,11 +737,6 @@
 	cmpw	%cx, (%bx)
 	jne	loop1
 	leaw	4(%bx), %dx 	// %ds:%dx filename
-#if defined(CHECK_REALMODE)
-	movb	$0x3D, %ah	// open, access = RO
-#else
-	movw	$0x3D00, %ax	// open, access = RO
-#endif
 	int	$0x21
 	jc	dosexit
 	xchgw	%ax, %bp	// fd
@@ -714,7 +757,7 @@
 #endif
 //	ljmp	$INITSEG, $loadsys
 	pushw	%ds
-	.byte	0x6A, loadsys-bootsect_start
+	.byte	0x6A, loadsys-bootsect_start	# pushw	$loadsys-bootsect_start
 	lretw
 #endif
 #define kernel_version_offset	0xE
@@ -722,6 +765,8 @@
 puts_version:
 	addw	kernel_version_offset(%si),%si	# starting protocol 2.00, Kernel 1.3.73
 #endif
+#if defined(DISPLAY_VERSION) || defined(README_SUPPORT) || defined(FLOPPY_CMDLINE) || defined(MULTI_FLOPPY)
+# ifndef NO_OUTPUT
 puts:
 	movb	$0xd, %al		# CR
 putcs:
@@ -729,10 +774,11 @@
 	lodsb
 	cmpb	$0, %al			# end of string is any byte <= 0
 	jg	putcs
-dosexit:
 	ret	
+# endif
+#endif
 
-#if !defined(FLOPPY_ONLY) && !defined(EXE_ONLY)
+#if defined(MULTI_FLOPPY) && !defined(EXE_ONLY)
 initregs:
 	popw	%si
 	INIT_REGS
@@ -741,7 +787,7 @@
 #endif
 
 
-#if !defined(SINGLE_FLOPPY) && !defined(EXE_SUPPORT)
+#if defined(MULTI_FLOPPY) && !defined(EXE_SUPPORT)
 #ifdef MULTI_INITRD
 swap_floppy2:
 	.ascii	"B or "
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 linux/stuff/linux-2.6.14-slitaz.config
--- a/linux/stuff/linux-2.6.14-slitaz.config	Wed Oct 07 10:53:41 2015 +0200
+++ b/linux/stuff/linux-2.6.14-slitaz.config	Fri Oct 09 10:21:00 2015 +0200
@@ -27,7 +27,7 @@
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_SYSCTL is not set
+CONFIG_SYSCTL=y 
 # CONFIG_AUDIT is not set
 # CONFIG_HOTPLUG is not set
 CONFIG_KOBJECT_UEVENT=y
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 lpd-config/receipt
--- a/lpd-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/lpd-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -29,7 +29,7 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	cat >> $1/etc/inetd.conf <<EOT
-printer	stream	tcp	nowait	root	/usr/sbin/lpd /usr/sbin/lpd /var/spool
+printer	stream	tcp	nowait	root	lpd lpd /var/spool
 EOT
 	n=0
 	for i in $(echo $LP_NAMES | sed 's/,/ /g') ; do
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 lpd-spooling-config/receipt
--- a/lpd-spooling-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/lpd-spooling-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -30,7 +30,7 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	cat >> $1/etc/inetd.conf <<EOT
-printer	stream	tcp	nowait	root	/usr/sbin/lpd /usr/sbin/lpd /var/spool /usr/sbin/lpd-helper
+printer	stream	tcp	nowait	root	lpd lpd /var/spool /usr/sbin/lpd-helper
 EOT
 	n=0
 	for i in $(echo $LP_NAMES | sed 's/,/ /g') ; do
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 manager/receipt
--- a/manager/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/manager/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -22,7 +22,7 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	grep -q /httpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
-http	stream	tcp	nowait	root	/usr/sbin/httpd	/usr/sbin/httpd -i -u 0:0
+http	stream	tcp	nowait	root	httpd	httpd -i -u 0:0
 EOT
 	while read line comment ; do
 		grep -qs "^$line" $1/etc/httpd.conf && continue
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 telnet-config/receipt
--- a/telnet-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/telnet-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -20,6 +20,6 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	grep -q telnetd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
-telnet	stream	tcp	nowait	root	/usr/sbin/telnetd	/usr/sbin/telnetd -i
+telnet	stream	tcp	nowait	root	telnetd	telnetd -i
 EOT
 }
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 udhcpd-config/receipt
--- a/udhcpd-config/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/udhcpd-config/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -8,12 +8,14 @@
 LICENSE="BSD"
 WEB_SITE="http://boot.slitaz.org/"
 DEPENDS="base-tiny"
+WANTED="busybox"
 CONFIG_FILES="/etc/udhcpd.conf /etc/rcS.conf"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/etc
+	cp $wanted_stuff/udhcpd.conf $fs/etc
 }
 
 DHCP_VARS="start end interface max_leases"
diff -r 2c3b4f47fbf5 -r bb00d1e3b0f7 wiki/receipt
--- a/wiki/receipt	Wed Oct 07 10:53:41 2015 +0200
+++ b/wiki/receipt	Fri Oct 09 10:21:00 2015 +0200
@@ -21,7 +21,7 @@
 	grep -q inetd $1/etc/rcS.conf ||
 	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
 	grep -q /httpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
-http	stream	tcp	nowait	root	/usr/sbin/httpd	/usr/sbin/httpd -i -u 0:0
+http	stream	tcp	nowait	root	httpd	httpd -i -u 0:0
 EOT
 	while read line comment ; do
 		grep -qs "^$line" $1/etc/httpd.conf && continue