From 8c99f46b7dcff6e38b298b363fc859d661fc88ba Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 25 Oct 2013 23:18:02 +0000 Subject: [PATCH] ZEROCONF and DOWNLOADER - using of SETTINGS directory for INI git-svn-id: svn://kolibrios.org@4101 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 2 +- data/eng/{ => settings}/network.ini | 0 data/et/Makefile | 2 +- data/et/{ => settings}/network.ini | 0 data/it/Makefile | 2 +- data/it/{ => settings}/network.ini | 0 data/rus/Makefile | 2 +- data/rus/{ => settings}/network.ini | 0 data/sp/Makefile | 2 +- data/sp/{ => settings}/network.ini | 0 programs/network/downloader/downloader.asm | 2 +- programs/network/zeroconf/zeroconf.asm | 2 +- 12 files changed, 7 insertions(+), 7 deletions(-) rename data/eng/{ => settings}/network.ini (100%) rename data/et/{ => settings}/network.ini (100%) rename data/it/{ => settings}/network.ini (100%) rename data/rus/{ => settings}/network.ini (100%) rename data/sp/{ => settings}/network.ini (100%) diff --git a/data/eng/Makefile b/data/eng/Makefile index ef9600dba6..bea9f48d16 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -319,7 +319,7 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/cEdg.obj:MEDIA/ImgF/cEdg.obj \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ - network.ini:NETWORK.INI \ + settings/network.ini:SETTINGS/NETWORK.INI \ network/ftpd.ini:NETWORK/FTPD.INI \ network/users.ini:NETWORK/USERS.INI \ #end of list diff --git a/data/eng/network.ini b/data/eng/settings/network.ini similarity index 100% rename from data/eng/network.ini rename to data/eng/settings/network.ini diff --git a/data/et/Makefile b/data/et/Makefile index ef9600dba6..bea9f48d16 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -319,7 +319,7 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/cEdg.obj:MEDIA/ImgF/cEdg.obj \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ - network.ini:NETWORK.INI \ + settings/network.ini:SETTINGS/NETWORK.INI \ network/ftpd.ini:NETWORK/FTPD.INI \ network/users.ini:NETWORK/USERS.INI \ #end of list diff --git a/data/et/network.ini b/data/et/settings/network.ini similarity index 100% rename from data/et/network.ini rename to data/et/settings/network.ini diff --git a/data/it/Makefile b/data/it/Makefile index fbfd0aa883..7d6d576d96 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -318,7 +318,7 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/cEdg.obj:MEDIA/ImgF/cEdg.obj \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ - network.ini:NETWORK.INI \ + settings/network.ini:SETTINGS/NETWORK.INI \ network/ftpd.ini:NETWORK/FTPD.INI \ network/users.ini:NETWORK/USERS.INI \ #end of list diff --git a/data/it/network.ini b/data/it/settings/network.ini similarity index 100% rename from data/it/network.ini rename to data/it/settings/network.ini diff --git a/data/rus/Makefile b/data/rus/Makefile index ebb13b20f4..e78e685fd8 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -314,7 +314,7 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/cEdg.obj:MEDIA/ImgF/cEdg.obj \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ - network.ini:NETWORK.INI \ + settings/network.ini:SETTINGS/NETWORK.INI \ network/ftpd.ini:NETWORK/FTPD.INI \ network/users.ini:NETWORK/USERS.INI \ #end of list diff --git a/data/rus/network.ini b/data/rus/settings/network.ini similarity index 100% rename from data/rus/network.ini rename to data/rus/settings/network.ini diff --git a/data/sp/Makefile b/data/sp/Makefile index 662d748bb2..2296bcb037 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -318,7 +318,7 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/cEdg.obj:MEDIA/ImgF/cEdg.obj \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ - network.ini:NETWORK.INI \ + settings/network.ini:SETTINGS/NETWORK.INI \ network/ftpd.ini:NETWORK/FTPD.INI \ network/users.ini:NETWORK/USERS.INI \ #end of list diff --git a/data/sp/network.ini b/data/sp/settings/network.ini similarity index 100% rename from data/sp/network.ini rename to data/sp/settings/network.ini diff --git a/programs/network/downloader/downloader.asm b/programs/network/downloader/downloader.asm index e746c5747d..6afa15d4cc 100644 --- a/programs/network/downloader/downloader.asm +++ b/programs/network/downloader/downloader.asm @@ -1021,7 +1021,7 @@ connclose_end: base64_table db 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' db '0123456789+/' -inifile db '/sys/network.ini', 0 +inifile db '/sys/settings/network.ini', 0 sec_proxy: key_proxy db 'proxy', 0 diff --git a/programs/network/zeroconf/zeroconf.asm b/programs/network/zeroconf/zeroconf.asm index b221b22e20..4d4705549a 100644 --- a/programs/network/zeroconf/zeroconf.asm +++ b/programs/network/zeroconf/zeroconf.asm @@ -640,7 +640,7 @@ notify_struct: db '/sys/@notify', 0 str_connected db 'You are now connected to the network.', 0 -path db '/sys/network.ini',0 +path db '/sys/settings/network.ini',0 IM_END: