wok-tiny rev 97
Fix libs build, inet.conf updates ...
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Oct 09 10:21:00 2015 +0200 (2015-10-09) |
| parents | 2c3b4f47fbf5 |
| children | 23642b5267cd |
| files | base-tiny/receipt busybox/stuff/daemon ftp-config/receipt gpxe/receipt hardware-ibm-6272/receipt lan-config/receipt libcrypt/receipt libdl/receipt libgcc_s/receipt libm/receipt libtcc/receipt libutil/receipt linux/stuff/bootloader.S linux/stuff/linux-2.6.14-slitaz.config lpd-config/receipt lpd-spooling-config/receipt manager/receipt telnet-config/receipt udhcpd-config/receipt wiki/receipt |
line diff
1.1 --- a/base-tiny/receipt Wed Oct 07 10:53:41 2015 +0200 1.2 +++ b/base-tiny/receipt Fri Oct 09 10:21:00 2015 +0200 1.3 @@ -9,7 +9,7 @@ 1.4 WEB_SITE="http://tiny.slitaz.org/" 1.5 AUTO_SELECTION="always" 1.6 CONFIG_FILES="/etc/network.conf /etc/rcS.conf /etc/passwd /etc/fstab \ 1.7 -/root/.profile /etc/init.d/local.sh" 1.8 +/etc/inetd.conf /etc/daemons.conf /root/.profile /etc/init.d/local.sh" 1.9 1.10 # Rules to gen a SliTaz package suitable for Tazpkg. 1.11 genpkg_rules()
2.1 --- a/busybox/stuff/daemon Wed Oct 07 10:53:41 2015 +0200 2.2 +++ b/busybox/stuff/daemon Fri Oct 09 10:21:00 2015 +0200 2.3 @@ -9,7 +9,7 @@ 2.4 2.5 NAME=$(basename $0) 2.6 DESC="$NAME deamon" 2.7 -DAEMON=$(which $NAME) 2.8 +DAEMON=$(which $NAME || echo $NAME) 2.9 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/') 2.10 PIDFILE=/var/run/$NAME.pid 2.11 2.12 @@ -39,6 +39,7 @@ 2.13 2.14 case "$1" in 2.15 start) 2.16 + [ $DAEMON != inetd ] && 2.17 grep -qs $DAEMON /etc/inetd.conf && active_inetd 2.18 if active_pidfile $PIDFILE $NAME ; then 2.19 echo "$NAME is already running." 2.20 @@ -51,6 +52,7 @@ 2.21 status 2.22 ;; 2.23 stop) 2.24 + [ $DAEMON != inetd ] && 2.25 grep -qs $DAEMON /etc/inetd.conf && inactive_inetd 2.26 if ! active_pidfile $PIDFILE $NAME ; then 2.27 echo "$NAME is not running." 2.28 @@ -61,6 +63,7 @@ 2.29 status 2.30 ;; 2.31 restart) 2.32 + [ $DAEMON != inetd ] && 2.33 grep -qs $DAEMON /etc/inetd.conf && exit 0 2.34 if ! active_pidfile $PIDFILE $NAME ; then 2.35 echo "$NAME is not running."
3.1 --- a/ftp-config/receipt Wed Oct 07 10:53:41 2015 +0200 3.2 +++ b/ftp-config/receipt Fri Oct 09 10:21:00 2015 +0200 3.3 @@ -30,6 +30,6 @@ 3.4 grep -q inetd $1/etc/rcS.conf || 3.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 3.6 grep -q /ftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 3.7 -ftp stream tcp nowait root /usr/sbin/ftpd /usr/sbin/ftpd $ROOT 3.8 +ftp stream tcp nowait root ftpd ftpd $ROOT 3.9 EOT 3.10 }
4.1 --- a/gpxe/receipt Wed Oct 07 10:53:41 2015 +0200 4.2 +++ b/gpxe/receipt Fri Oct 09 10:21:00 2015 +0200 4.3 @@ -41,7 +41,7 @@ 4.4 grep -q udhcpd $1/etc/rcS.conf || 4.5 sed -i 's/^RUN_DAEMONS="/&udhcpd /' $1/etc/rcS.conf 4.6 grep -q tftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 4.7 -tftp dgram udp wait root /usr/bin/tftpd /usr/bin/tftpd -r /usr/share/boot 4.8 +tftp dgram udp wait root tftpd tftpd -r /usr/share/boot 4.9 EOT 4.10 cat >> $1/etc/udhcpd.conf <<EOT 4.11 opt bootfile gpxe.pxe
5.1 --- a/hardware-ibm-6272/receipt Wed Oct 07 10:53:41 2015 +0200 5.2 +++ b/hardware-ibm-6272/receipt Fri Oct 09 10:21:00 2015 +0200 5.3 @@ -19,7 +19,7 @@ 5.4 5.5 . /etc/init.d/rc.functions 5.6 EOT 5.7 - chmod +x $fs/etc/init.d/pnp.sh 5.8 + chmod +x $1/etc/init.d/pnp.sh 5.9 cat >> $1/etc/init.d/pnp.sh <<EOT 5.10 5.11 echo -n "Switching on cs89x0 isa pnp ethernet card " 5.12 @@ -51,7 +51,7 @@ 5.13 sed -i 's/cs89x0[^ "]* //' $1/etc/rcS.conf 5.14 sed -i '/rm -f .sbin.*pnp/d' $1/etc/init.d/pnp.sh 5.15 [ "$CS89X0_WIPEPNP" == "on" ] && 5.16 - echo 'rm -f /sbin/pnpdump /sbin/isapnp' >> $1/etc/init.d/pnp.sh 5.17 + echo 'rm -f /sbin/pnpdump /sbin/isapnp /etc/isapnp.conf' >> $1/etc/init.d/pnp.sh 5.18 } 5.19 5.20 config_form()
6.1 --- a/lan-config/receipt Wed Oct 07 10:53:41 2015 +0200 6.2 +++ b/lan-config/receipt Fri Oct 09 10:21:00 2015 +0200 6.3 @@ -48,7 +48,7 @@ 6.4 # Rules to gen a SliTaz package suitable for Tazpkg. 6.5 genpkg_rules() 6.6 { 6.7 - cp -a $stuff/. $fs 6.8 + cp -a $stuff/. $fs/ 6.9 } 6.10 6.11 config_form()
7.1 --- a/libcrypt/receipt Wed Oct 07 10:53:41 2015 +0200 7.2 +++ b/libcrypt/receipt Fri Oct 09 10:21:00 2015 +0200 7.3 @@ -11,9 +11,16 @@ 7.4 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 7.5 WEB_SITE="http://tiny.slitaz.org/" 7.6 7.7 +# Rules to configure and make the package. 7.8 +compile_rules() 7.9 +{ 7.10 + mkdir -p $DESTDIR/lib 7.11 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib 7.12 +} 7.13 + 7.14 # Rules to gen a SliTaz package suitable for Tazpkg. 7.15 genpkg_rules() 7.16 { 7.17 - mkdir -p $fs/lib 7.18 - cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib 7.19 + cp -a $install/lib $fs/ 7.20 + chown 0.0 $fs/lib/* 7.21 }
8.1 --- a/libdl/receipt Wed Oct 07 10:53:41 2015 +0200 8.2 +++ b/libdl/receipt Fri Oct 09 10:21:00 2015 +0200 8.3 @@ -11,9 +11,16 @@ 8.4 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 8.5 WEB_SITE="http://tiny.slitaz.org/" 8.6 8.7 +# Rules to configure and make the package. 8.8 +compile_rules() 8.9 +{ 8.10 + mkdir -p $DESTDIR/lib 8.11 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib 8.12 +} 8.13 + 8.14 # Rules to gen a SliTaz package suitable for Tazpkg. 8.15 genpkg_rules() 8.16 { 8.17 - mkdir -p $fs/lib 8.18 - cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib 8.19 + cp -a $install/lib $fs/ 8.20 + chown 0.0 $fs/lib/* 8.21 }
9.1 --- a/libgcc_s/receipt Wed Oct 07 10:53:41 2015 +0200 9.2 +++ b/libgcc_s/receipt Fri Oct 09 10:21:00 2015 +0200 9.3 @@ -11,9 +11,16 @@ 9.4 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 9.5 WEB_SITE="http://tiny.slitaz.org/" 9.6 9.7 +# Rules to configure and make the package. 9.8 +compile_rules() 9.9 +{ 9.10 + mkdir -p $DESTDIR/lib 9.11 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib 9.12 +} 9.13 + 9.14 # Rules to gen a SliTaz package suitable for Tazpkg. 9.15 genpkg_rules() 9.16 { 9.17 - mkdir -p $fs/lib 9.18 - cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib 9.19 + cp -a $install/lib $fs/ 9.20 + chown 0.0 $fs/lib/* 9.21 }
10.1 --- a/libm/receipt Wed Oct 07 10:53:41 2015 +0200 10.2 +++ b/libm/receipt Fri Oct 09 10:21:00 2015 +0200 10.3 @@ -11,9 +11,16 @@ 10.4 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 10.5 WEB_SITE="http://tiny.slitaz.org/" 10.6 10.7 +# Rules to configure and make the package. 10.8 +compile_rules() 10.9 +{ 10.10 + mkdir -p $DESTDIR/lib 10.11 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib 10.12 +} 10.13 + 10.14 # Rules to gen a SliTaz package suitable for Tazpkg. 10.15 genpkg_rules() 10.16 { 10.17 - mkdir -p $fs/lib 10.18 - cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib 10.19 + cp -a $install/lib $fs/ 10.20 + chown 0.0 $fs/lib/* 10.21 }
11.1 --- a/libtcc/receipt Wed Oct 07 10:53:41 2015 +0200 11.2 +++ b/libtcc/receipt Fri Oct 09 10:21:00 2015 +0200 11.3 @@ -13,6 +13,6 @@ 11.4 genpkg_rules() 11.5 { 11.6 mkdir -p $fs/usr/lib 11.7 - cp -a $_pkg/usr/include $fs/usr 11.8 - cp -a $_pkg/usr/lib/libtcc.a $fs/usr/lib 11.9 + cp -a $install/usr/include $fs/usr 11.10 + cp -a $install/usr/lib/libtcc.a $fs/usr/lib 11.11 }
12.1 --- a/libutil/receipt Wed Oct 07 10:53:41 2015 +0200 12.2 +++ b/libutil/receipt Fri Oct 09 10:21:00 2015 +0200 12.3 @@ -11,9 +11,16 @@ 12.4 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 12.5 WEB_SITE="http://tiny.slitaz.org/" 12.6 12.7 +# Rules to configure and make the package. 12.8 +compile_rules() 12.9 +{ 12.10 + mkdir -p $DESTDIR/lib 12.11 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $DESTDIR/lib 12.12 +} 12.13 + 12.14 # Rules to gen a SliTaz package suitable for Tazpkg. 12.15 genpkg_rules() 12.16 { 12.17 - mkdir -p $fs/lib 12.18 - cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/$PACKAGE*.so* $fs/lib 12.19 + cp -a $install/lib $fs/ 12.20 + chown 0.0 $fs/lib/* 12.21 }
13.1 --- a/linux/stuff/bootloader.S Wed Oct 07 10:53:41 2015 +0200 13.2 +++ b/linux/stuff/bootloader.S Fri Oct 09 10:21:00 2015 +0200 13.3 @@ -17,9 +17,13 @@ 13.4 #endif 13.5 13.6 /* Assume protocol 2.00+ (kernel >= 1.3.73) */ 13.7 -/* feature set */ 13.8 + 13.9 +/* basic support: zImage or bzImage, floppy parameters table patch, */ 13.10 +/* any sectors/track count (720K, 1.2M, 1.44M floppy or 1.68M ...), */ 13.11 +/* show progress (.), show errors (-) */ 13.12 + 13.13 +/* extra feature set */ 13.14 #define EXE_SUPPORT real mode dos .exe file support 13.15 -// #define EXE_ONLY remove floppy code 13.16 #define EXE_CMDLINE kernel >= 2.4 13.17 // #define FLOPPY_CMDLINE kernel >= 2.4 13.18 // #define OLDCMDLINE kernel < 2.4 13.19 @@ -28,8 +32,8 @@ 13.20 #define KEYBOARDLESS_SUPPORT scan floppy swap each 5 seconds 13.21 // #define FAT12_SUPPORT will format the floppy free space in FAT 12 13.22 // #define CHECK_REALMODE exe dont crash when started in vm86 13.23 -// #define SINGLE_FLOPPY Everything fit in a single floppy 13.24 -// #define EDIT_CMDLINE 13.25 +#define MULTI_FLOPPY Everything may dont fit in a single floppy 13.26 +// #define EDIT_CMDLINE Wait 5 seconds for the first key to edit it 13.27 // #define MOVE_CMDLINE 13.28 #define INITRD_SUPPORT 13.29 // #define INITRD_AUTOADDR Hole in 16Mb..32Mb 13.30 @@ -38,9 +42,21 @@ 13.31 // #define COUNTER Show floppy number 13.32 #define LABEL "SliTaz" 13.33 13.34 +/* remove from basic features */ 13.35 +// #define EXE_ONLY remove floppy code 13.36 +// #define NO_FLOPPY_TABLE_PATCH remove floppy parameter table patch 13.37 +// #define NO_OUTPUT remove output code 13.38 + 13.39 .code16 13.40 .org 0 13.41 13.42 +#ifdef NO_OUTPUT 13.43 +# undef DISPLAY_VERSION 13.44 +# undef README_SUPPORT 13.45 +# undef FLOPPY_CMDLINE 13.46 +# undef COUNTER 13.47 +#endif 13.48 + 13.49 bootsect_start: 13.50 13.51 cur_initrd_size_ofs = 494 13.52 @@ -57,7 +73,11 @@ 13.53 13.54 13.55 stacktop = 0x9E00 # in 0x8000 .. 0xA000 13.56 +#ifdef NO_FLOPPY_TABLE_PATCH 13.57 +zeroed = 48+8 # gdt + zeroed registers 13.58 +#else 13.59 zeroed = 48+10 # gdt + zeroed registers 13.60 +#endif 13.61 .macro INIT_REGS 13.62 movw $stacktop-zeroed, %di # stacktop is an arbitrary value >= 13.63 # length of bootsect + length of 13.64 @@ -69,7 +89,7 @@ 13.65 pushw %ss 13.66 popw %es # %es = %ss = INITSEG 13.67 xorw %ax, %ax # %ax = 0 13.68 -#if defined(EXE_CMDLINE) 13.69 +#ifdef EXE_CMDLINE 13.70 movw $zeroed+1, %cx # clear gdt + offset, %ds, limits, cmdline="" 13.71 rep # don't worry about cld 13.72 stosb # already done above 13.73 @@ -115,7 +135,7 @@ 13.74 .word 0 // Checksum 13.75 .word EXEADRS(comstart) // Initial IP value 13.76 .word 0xFFF0 // Initial (relative) CS value 13.77 -#if defined(EXE_ONLY) || defined(SINGLE_FLOPPY) || defined(COUNTER) 13.78 +#if defined(EXE_ONLY) || !defined(MULTI_FLOPPY) || defined(COUNTER) 13.79 // .word 0x001C // File address of relocation table 13.80 // .word 0,0,0 // Overlay number 13.81 .ascii "(SliTaz)" 13.82 @@ -144,7 +164,7 @@ 13.83 13.84 #if defined(EXE_SUPPORT) || defined(EXE_ONLY) 13.85 A20BUFFER = 0x68000 # a20 gate / himem.sys support 13.86 -#define USEA20BUFFER 13.87 +#define USEA20BUFFER # Does not break zImage support 13.88 #endif 13.89 13.90 #ifndef EXE_ONLY 13.91 @@ -173,15 +193,26 @@ 13.92 # High doesn't hurt. Low does. Let's use the max: 63 13.93 13.94 cli 13.95 +#ifdef NO_FLOPPY_TABLE_PATCH 13.96 + xchg %ax, %di # sector count 13.97 + popw %ax # limits = 0 13.98 + incw %cx # cylinder 0, sector 1, clear Z 13.99 + call read_first_sectors # read setup 13.100 +# ifdef FLOPPY_CMDLINE 13.101 + movw $0, %si # patched by installer (7C22) 13.102 +skipcmdline: 13.103 +#define cmd_line_ptr 0x22 13.104 +# endif 13.105 +#else 13.106 ldsw 0x78(%bx), %si # %ds:%bx+0x78 is parameter table address 13.107 popw %di 13.108 pushw %es 13.109 pushw %di 13.110 -#ifdef FLOPPY_CMDLINE 13.111 +# ifdef FLOPPY_CMDLINE 13.112 movw $0, %bp # patched by installer (7C22) 13.113 skipcmdline: 13.114 #define cmd_line_ptr 0x22 13.115 -#endif 13.116 +# endif 13.117 movb $6, %cl # copy 12 bytes 13.118 rep # don't worry about cld 13.119 movsw # already done above 13.120 @@ -194,6 +225,7 @@ 13.121 popw %ax # limits = 0 13.122 incw %cx # cylinder 0, sector 1, clear Z 13.123 call read_first_sectors # read setup 13.124 +#endif 13.125 #ifdef README_SUPPORT 13.126 xorw %si, %si 13.127 orw readme, %si 13.128 @@ -275,7 +307,6 @@ 13.129 # possible, loading whole tracks whenever we can. 13.130 13.131 .macro autoaddr base 13.132 -#ifdef INITRD_AUTOADDR 13.133 movb $0x88, %ah 13.134 int $0x15 13.135 //jc NeedMoreRAM # error code 80 or 86 13.136 @@ -284,7 +315,6 @@ 13.137 movb %ch, bootsect_dst_base_hi(%si) # initramfs @ 32M 13.138 movb %ch, ramdisk_image_ofs+3-\base 13.139 NeedMoreRAM: 13.140 -#endif 13.141 .endm 13.142 13.143 bootsect_src_limit = 16 13.144 @@ -400,7 +430,9 @@ 13.145 je nextInitrd 13.146 orw %bx, %bx 13.147 je bootit # no initrd 13.148 +# ifdef INITRD_AUTOADDR 13.149 autoaddr cur_initrd_size_ofs(%di) 13.150 +# endif 13.151 movw ramdisk_image+1,%ax 13.152 jmp initrdlp 13.153 nextInitrd: 13.154 @@ -416,7 +448,9 @@ 13.155 #ifdef MORETHAN16M 13.156 cmpb %cl, ramdisk_image+2-ramdisk_size(%bx) 13.157 jb bootit 13.158 +# ifdef INITRD_AUTOADDR 13.159 autoaddr ramdisk_size_ofs(%bx) 13.160 +# endif 13.161 movw ramdisk_image+1,%ax 13.162 shrw %cl, boot_flag-ramdisk_size(%bx) 13.163 jne initrdlp 13.164 @@ -477,8 +511,8 @@ 13.165 #define FLOPPY_CYLINDERS 80 13.166 #define FLOPPY_HEADS 2 13.167 13.168 +#if defined(MULTI_FLOPPY) && defined(COUNTER) 13.169 .macro putsmsg 13.170 -#if !defined(SINGLE_FLOPPY) && defined(COUNTER) 13.171 movw $msgdigit+1-msg, %bx 13.172 nextdigit: 13.173 andb $0xF0, (%bx,%si) 13.174 @@ -486,9 +520,13 @@ 13.175 incb (%bx,%si) 13.176 cmpb $'9', (%bx,%si) 13.177 ja nextdigit 13.178 -#endif 13.179 call puts 13.180 .endm 13.181 +#else 13.182 +.macro putsmsg 13.183 + call puts 13.184 +.endm 13.185 +#endif 13.186 13.187 check_limits: 13.188 popw %dx 13.189 @@ -496,8 +534,10 @@ 13.190 ja next_head # no -> store it 13.191 pushaw 13.192 int $0x13 # reset controler 13.193 +#ifndef NO_OUTPUT 13.194 stc 13.195 call putcdot # print '-' 13.196 +#endif 13.197 read_sectorslp: 13.198 popaw 13.199 bdendlp: 13.200 @@ -540,7 +580,7 @@ 13.201 jne bdendlp # reach head limit ? 13.202 incb %ch # next cylinder 13.203 read_first_sectors: 13.204 -#ifdef SINGLE_FLOPPY 13.205 +#ifndef MULTI_FLOPPY 13.206 jmp bdendlp 13.207 #else 13.208 cmpb $FLOPPY_CYLINDERS,%ch # reach cylinder limit ? 13.209 @@ -552,7 +592,9 @@ 13.210 dpy_swap_floppy: 13.211 #ifdef KEYBOARDLESS_SUPPORT 13.212 pushw %bx 13.213 +# ifndef NO_OUTPUT 13.214 putsmsg 13.215 +# endif 13.216 popw %bx 13.217 movw %si, %bp 13.218 waitfloppy: 13.219 @@ -579,7 +621,9 @@ 13.220 jne waitfloppy 13.221 waitfloppydone: 13.222 #else 13.223 +# ifndef NO_OUTPUT 13.224 putsmsg 13.225 +# endif 13.226 cbw # %ah = 0, get keyboard character 13.227 int $0x16 13.228 #endif 13.229 @@ -610,6 +654,7 @@ 13.230 #endif 13.231 13.232 putcdot: 13.233 +#ifndef NO_OUTPUT 13.234 movb $'.'+3, %al // . = success, - = failure 13.235 putclf: 13.236 sbbb $3, %al 13.237 @@ -619,6 +664,8 @@ 13.238 int $0x10 13.239 cmp $0xd, %al # CR ? 13.240 je putclf 13.241 +#endif 13.242 +dosexit: 13.243 ret 13.244 13.245 #ifdef KEYBOARDLESS_SUPPORT 13.246 @@ -655,12 +702,10 @@ 13.247 movw $0x80, %si 13.248 movb (%si), %cl 13.249 incw %si 13.250 -# ifdef OLDCMDLINE 13.251 -# ifdef FLOPPY_CMDLINE 13.252 +# if defined(OLDCMDLINE) && defined(FLOPPY_CMDLINE) 13.253 jcxz nocmdline 13.254 movw %di, EXEADRS(0x22) 13.255 movw $0xA33F, 0x7F(%si) 13.256 -# endif 13.257 # endif 13.258 rep 13.259 movsb 13.260 @@ -682,6 +727,9 @@ 13.261 # else 13.262 jne dosexit // real mode only... 13.263 # endif 13.264 + movb $0x3D, %ah // open, access = RO 13.265 +#else 13.266 + movw $0x3D00, %ax // open, access = RO 13.267 #endif 13.268 movw 0x2C(%bx), %ds // DOS 3.0+ 13.269 loop1: 13.270 @@ -689,11 +737,6 @@ 13.271 cmpw %cx, (%bx) 13.272 jne loop1 13.273 leaw 4(%bx), %dx // %ds:%dx filename 13.274 -#if defined(CHECK_REALMODE) 13.275 - movb $0x3D, %ah // open, access = RO 13.276 -#else 13.277 - movw $0x3D00, %ax // open, access = RO 13.278 -#endif 13.279 int $0x21 13.280 jc dosexit 13.281 xchgw %ax, %bp // fd 13.282 @@ -714,7 +757,7 @@ 13.283 #endif 13.284 // ljmp $INITSEG, $loadsys 13.285 pushw %ds 13.286 - .byte 0x6A, loadsys-bootsect_start 13.287 + .byte 0x6A, loadsys-bootsect_start # pushw $loadsys-bootsect_start 13.288 lretw 13.289 #endif 13.290 #define kernel_version_offset 0xE 13.291 @@ -722,6 +765,8 @@ 13.292 puts_version: 13.293 addw kernel_version_offset(%si),%si # starting protocol 2.00, Kernel 1.3.73 13.294 #endif 13.295 +#if defined(DISPLAY_VERSION) || defined(README_SUPPORT) || defined(FLOPPY_CMDLINE) || defined(MULTI_FLOPPY) 13.296 +# ifndef NO_OUTPUT 13.297 puts: 13.298 movb $0xd, %al # CR 13.299 putcs: 13.300 @@ -729,10 +774,11 @@ 13.301 lodsb 13.302 cmpb $0, %al # end of string is any byte <= 0 13.303 jg putcs 13.304 -dosexit: 13.305 ret 13.306 +# endif 13.307 +#endif 13.308 13.309 -#if !defined(FLOPPY_ONLY) && !defined(EXE_ONLY) 13.310 +#if defined(MULTI_FLOPPY) && !defined(EXE_ONLY) 13.311 initregs: 13.312 popw %si 13.313 INIT_REGS 13.314 @@ -741,7 +787,7 @@ 13.315 #endif 13.316 13.317 13.318 -#if !defined(SINGLE_FLOPPY) && !defined(EXE_SUPPORT) 13.319 +#if defined(MULTI_FLOPPY) && !defined(EXE_SUPPORT) 13.320 #ifdef MULTI_INITRD 13.321 swap_floppy2: 13.322 .ascii "B or "
14.1 --- a/linux/stuff/linux-2.6.14-slitaz.config Wed Oct 07 10:53:41 2015 +0200 14.2 +++ b/linux/stuff/linux-2.6.14-slitaz.config Fri Oct 09 10:21:00 2015 +0200 14.3 @@ -27,7 +27,7 @@ 14.4 # CONFIG_SYSVIPC is not set 14.5 # CONFIG_POSIX_MQUEUE is not set 14.6 # CONFIG_BSD_PROCESS_ACCT is not set 14.7 -# CONFIG_SYSCTL is not set 14.8 +CONFIG_SYSCTL=y 14.9 # CONFIG_AUDIT is not set 14.10 # CONFIG_HOTPLUG is not set 14.11 CONFIG_KOBJECT_UEVENT=y
15.1 --- a/lpd-config/receipt Wed Oct 07 10:53:41 2015 +0200 15.2 +++ b/lpd-config/receipt Fri Oct 09 10:21:00 2015 +0200 15.3 @@ -29,7 +29,7 @@ 15.4 grep -q inetd $1/etc/rcS.conf || 15.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 15.6 cat >> $1/etc/inetd.conf <<EOT 15.7 -printer stream tcp nowait root /usr/sbin/lpd /usr/sbin/lpd /var/spool 15.8 +printer stream tcp nowait root lpd lpd /var/spool 15.9 EOT 15.10 n=0 15.11 for i in $(echo $LP_NAMES | sed 's/,/ /g') ; do
16.1 --- a/lpd-spooling-config/receipt Wed Oct 07 10:53:41 2015 +0200 16.2 +++ b/lpd-spooling-config/receipt Fri Oct 09 10:21:00 2015 +0200 16.3 @@ -30,7 +30,7 @@ 16.4 grep -q inetd $1/etc/rcS.conf || 16.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 16.6 cat >> $1/etc/inetd.conf <<EOT 16.7 -printer stream tcp nowait root /usr/sbin/lpd /usr/sbin/lpd /var/spool /usr/sbin/lpd-helper 16.8 +printer stream tcp nowait root lpd lpd /var/spool /usr/sbin/lpd-helper 16.9 EOT 16.10 n=0 16.11 for i in $(echo $LP_NAMES | sed 's/,/ /g') ; do
17.1 --- a/manager/receipt Wed Oct 07 10:53:41 2015 +0200 17.2 +++ b/manager/receipt Fri Oct 09 10:21:00 2015 +0200 17.3 @@ -22,7 +22,7 @@ 17.4 grep -q inetd $1/etc/rcS.conf || 17.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 17.6 grep -q /httpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 17.7 -http stream tcp nowait root /usr/sbin/httpd /usr/sbin/httpd -i -u 0:0 17.8 +http stream tcp nowait root httpd httpd -i -u 0:0 17.9 EOT 17.10 while read line comment ; do 17.11 grep -qs "^$line" $1/etc/httpd.conf && continue
18.1 --- a/telnet-config/receipt Wed Oct 07 10:53:41 2015 +0200 18.2 +++ b/telnet-config/receipt Fri Oct 09 10:21:00 2015 +0200 18.3 @@ -20,6 +20,6 @@ 18.4 grep -q inetd $1/etc/rcS.conf || 18.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 18.6 grep -q telnetd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 18.7 -telnet stream tcp nowait root /usr/sbin/telnetd /usr/sbin/telnetd -i 18.8 +telnet stream tcp nowait root telnetd telnetd -i 18.9 EOT 18.10 }
19.1 --- a/udhcpd-config/receipt Wed Oct 07 10:53:41 2015 +0200 19.2 +++ b/udhcpd-config/receipt Fri Oct 09 10:21:00 2015 +0200 19.3 @@ -8,12 +8,14 @@ 19.4 LICENSE="BSD" 19.5 WEB_SITE="http://boot.slitaz.org/" 19.6 DEPENDS="base-tiny" 19.7 +WANTED="busybox" 19.8 CONFIG_FILES="/etc/udhcpd.conf /etc/rcS.conf" 19.9 19.10 # Rules to gen a SliTaz package suitable for Tazpkg. 19.11 genpkg_rules() 19.12 { 19.13 mkdir -p $fs/etc 19.14 + cp $wanted_stuff/udhcpd.conf $fs/etc 19.15 } 19.16 19.17 DHCP_VARS="start end interface max_leases"
20.1 --- a/wiki/receipt Wed Oct 07 10:53:41 2015 +0200 20.2 +++ b/wiki/receipt Fri Oct 09 10:21:00 2015 +0200 20.3 @@ -21,7 +21,7 @@ 20.4 grep -q inetd $1/etc/rcS.conf || 20.5 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 20.6 grep -q /httpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 20.7 -http stream tcp nowait root /usr/sbin/httpd /usr/sbin/httpd -i -u 0:0 20.8 +http stream tcp nowait root httpd httpd -i -u 0:0 20.9 EOT 20.10 while read line comment ; do 20.11 grep -qs "^$line" $1/etc/httpd.conf && continue