wok-tiny rev 113
misc updates (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Mar 30 13:45:46 2016 +0200 (2016-03-30) |
parents | 14e714f8c808 |
children | 8af7d8943f03 |
files | ftp-config/receipt gpxe/receipt linux/stuff/linux-2.6.14-slitaz.config |
line diff
1.1 --- a/ftp-config/receipt Wed Mar 30 09:53:55 2016 +0200 1.2 +++ b/ftp-config/receipt Wed Mar 30 13:45:46 2016 +0200 1.3 @@ -2,7 +2,8 @@ 1.4 1.5 PACKAGE="ftp-config" 1.6 VERSION="1.0" 1.7 -CATEGORY="network" 1.8 +CATEGORY="meta" 1.9 +GROUP="network" 1.10 SHORT_DESC="File transport protocol server configuration" 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 LICENSE="BSD" 1.13 @@ -29,8 +30,8 @@ 1.14 [ -n "$UPLOAD" ] && ROOT="-w $ROOT" 1.15 grep -q inetd $1/etc/rcS.conf || 1.16 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 1.17 - sed -i '/^#ftp/d' $1/etc/inetd.conf 1.18 - grep -q ^ftp $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 1.19 + sed -i '/#ftp/d' $1/etc/inetd.conf 1.20 + grep -q ftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 1.21 ftp stream tcp nowait root ftpd ftpd $ROOT 1.22 EOT 1.23 }
2.1 --- a/gpxe/receipt Wed Mar 30 09:53:55 2016 +0200 2.2 +++ b/gpxe/receipt Wed Mar 30 13:45:46 2016 +0200 2.3 @@ -40,6 +40,7 @@ 2.4 sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf 2.5 grep -q udhcpd $1/etc/rcS.conf || 2.6 sed -i 's/^RUN_DAEMONS="/&udhcpd /' $1/etc/rcS.conf 2.7 + sed -i '/#tftp/d' $1/etc/inetd.conf 2.8 grep -q tftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT 2.9 tftp dgram udp wait root tftpd tftpd -r /usr/share/boot 2.10 EOT
3.1 --- a/linux/stuff/linux-2.6.14-slitaz.config Wed Mar 30 09:53:55 2016 +0200 3.2 +++ b/linux/stuff/linux-2.6.14-slitaz.config Wed Mar 30 13:45:46 2016 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # 3.5 # Automatically generated make config: don't edit 3.6 # Linux kernel version: 2.6.14-tiny1 3.7 -# Sun Mar 6 11:30:55 2016 3.8 +# Mon Mar 14 12:36:45 2016 3.9 # 3.10 CONFIG_X86=y 3.11 CONFIG_SEMAPHORE_SLEEPERS=y 3.12 @@ -29,7 +29,7 @@ 3.13 # CONFIG_BSD_PROCESS_ACCT is not set 3.14 CONFIG_SYSCTL=y 3.15 # CONFIG_AUDIT is not set 3.16 -# CONFIG_HOTPLUG is not set 3.17 +CONFIG_HOTPLUG=y 3.18 CONFIG_KOBJECT_UEVENT=y 3.19 # CONFIG_IKCONFIG is not set 3.20 CONFIG_INITRAMFS_SOURCE="rootfs.cpio" 3.21 @@ -37,7 +37,7 @@ 3.22 CONFIG_INITRAMFS_ROOT_GID=0 3.23 CONFIG_EMBEDDED=y 3.24 # CONFIG_KALLSYMS is not set 3.25 -CONFIG_PRINTK=y 3.26 +CONFIG_PRINTK=y 3.27 # CONFIG_BUG is not set 3.28 # CONFIG_KMALLOC_ACCOUNTING is not set 3.29 # CONFIG_AUDIT_BOOTMEM is not set 3.30 @@ -1254,7 +1254,7 @@ 3.31 # 3.32 CONFIG_NLS=m 3.33 CONFIG_NLS_DEFAULT="utf8" 3.34 -CONFIG_NLS_CODEPAGE_437=y 3.35 +CONFIG_NLS_CODEPAGE_437=m 3.36 # CONFIG_NLS_CODEPAGE_737 is not set 3.37 # CONFIG_NLS_CODEPAGE_775 is not set 3.38 # CONFIG_NLS_CODEPAGE_850 is not set