mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow /var/etc/fstab and /var/etc/autofs.* only for netfs setup

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a0c4bb181
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-12 (Thu, 12 Dec 2019)

Origin message was:
------------------
- allow /var/etc/fstab and /var/etc/autofs.* only for netfs setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-12-12 22:51:48 +01:00
parent b72d3b56de
commit 0ab2a2d48c
11 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
data/config/settingsupdate.conf
View File

@@ -3,7 +3,7 @@
#:LogFile=/tmp/update.log #:LogFile=/tmp/update.log
## M<EFBFBD>gliche Eintr<EFBFBD>ge f<EFBFBD>r Sicherungen: ## Mögliche Einträge für Sicherungen:
#==================================== #====================================
# ganzes Verzeichnis # ganzes Verzeichnis
#------------------- #-------------------
@@ -18,11 +18,11 @@
# /bin/*.sh # /bin/*.sh
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
## Die Verzeichnisse "/", "/dev", "/proc", "/sys", "/mnt", "/tmp" k<EFBFBD>nnen nicht gesichert werden!! ## Die Verzeichnisse "/", "/dev", "/proc", "/sys", "/mnt", "/tmp" können nicht gesichert werden!!
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
## vor der Sicherung aus dem neuen Image zu l<EFBFBD>schende Dateien/Verzeichnisse, ## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
## gekennzeichnet durch ein vorangestelltes ~ ## gekennzeichnet durch ein vorangestelltes ~
# z.B. # z.B.
# ~/share/tuxbox/neutrino/themes/Classic.theme # ~/share/tuxbox/neutrino/themes/Classic.theme
@@ -51,21 +51,20 @@
/var/tuxbox/config/srv.conf /var/tuxbox/config/srv.conf
/var/tuxbox/config/flex/flex_eigene_scripte.conf /var/tuxbox/config/flex/flex_eigene_scripte.conf
/var/bin/ /var/bin/
/var/etc/
/var/keys/ /var/keys/
/etc/auto.net*
/etc/exports /etc/exports
/etc/fstab
/etc/hostname /etc/hostname
/etc/hosts /etc/hosts
/etc/resolv.conf
/etc/profile.local
/etc/network/interfaces /etc/network/interfaces
/etc/wpa_supplicant.conf
/etc/passwd /etc/passwd
/etc/profile.local
/etc/resolv.conf
/etc/wpa_supplicant.conf
## Pers<EFBFBD>nliche Sicherungen ## Persönliche Sicherungen
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------
## von der Sicherung auszuschlie<EFBFBD>ende Dateien, gekennzeichnet durch ein vorangestelltes - ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
#---------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------

8
data/locale/english.locale
View File

@@ -1516,10 +1516,10 @@ menu.hint_net_telnet Enable telnet login to your box
menu.hint_net_test Test network connection: ping gateway,\n name server and external IP menu.hint_net_test Test network connection: ping gateway,\n name server and external IP
menu.hint_net_ushare Share connected HDD over uPnp menu.hint_net_ushare Share connected HDD over uPnp
menu.hint_net_xupnpd Share live channels over UPNP menu.hint_net_xupnpd Share live channels over UPNP
menu.hint_netfs_automount_write Save automount entries and write /etc/auto.net menu.hint_netfs_automount_write Save automount entries and write %s
menu.hint_netfs_fstab_domount Mount fstab entries menu.hint_netfs_fstab_domount Mount fstab entries
menu.hint_netfs_fstab_doumount Umount fstab entries menu.hint_netfs_fstab_doumount Umount fstab entries
menu.hint_netfs_fstab_write Save fstab entries and write /etc/fstab menu.hint_netfs_fstab_write Save fstab entries and write %s
menu.hint_netfs_menu_main_automount Configure automount entries menu.hint_netfs_menu_main_automount Configure automount entries
menu.hint_netfs_menu_main_fstab Configure fstab entries menu.hint_netfs_menu_main_fstab Configure fstab entries
menu.hint_netfs_menu_main_head Fstab and automount configuration menu.hint_netfs_menu_main_head Fstab and automount configuration
@@ -2193,7 +2193,7 @@ mpkey.time Show time
netfs.active_onoff Entry active netfs.active_onoff Entry active
netfs.automount_edit Edit auto.net netfs.automount_edit Edit auto.net
netfs.automount_head NetFS settings netfs.automount_head NetFS settings
netfs.automount_intro /etc/auto.net entries netfs.automount_intro auto.net entries
netfs.automount_intro_mounts edit NetFS mounts netfs.automount_intro_mounts edit NetFS mounts
netfs.automount_write save settings and write auto.net netfs.automount_write save settings and write auto.net
netfs.automount_write_info auto.net written netfs.automount_write_info auto.net written
@@ -2204,7 +2204,7 @@ netfs.fstab_domount_info Running '/etc/init.d/fstab start_netfs'
netfs.fstab_doumount unmount NetFS directory netfs.fstab_doumount unmount NetFS directory
netfs.fstab_doumount_info Running '/etc/init.d/fstab stop_netfs' netfs.fstab_doumount_info Running '/etc/init.d/fstab stop_netfs'
netfs.fstab_head NetFS settings netfs.fstab_head NetFS settings
netfs.fstab_intro /etc/fstab entries netfs.fstab_intro fstab entries
netfs.fstab_intro_mounts Edit NetFS mounts netfs.fstab_intro_mounts Edit NetFS mounts
netfs.fstab_write save settings and write fstab netfs.fstab_write save settings and write fstab
netfs.fstab_write_info fstab written netfs.fstab_write_info fstab written

12
data/locale/slovak.locale
View File

@@ -1442,10 +1442,10 @@ menu.hint_net_telnet Použitie telnet prihlásenia do vášho prijímača
menu.hint_net_test Test sieťového pripojenia: ping brány,\n názov servera a externé IP menu.hint_net_test Test sieťového pripojenia: ping brány,\n názov servera a externé IP
menu.hint_net_ushare Zdielanie pripojeného HDD cez uPnp menu.hint_net_ushare Zdielanie pripojeného HDD cez uPnp
menu.hint_net_xupnpd Zdielanie "Živých kanálov" cez uPnp menu.hint_net_xupnpd Zdielanie "Živých kanálov" cez uPnp
menu.hint_netfs_automount_write Uloženie autopripojených záznamov a zapísanie /etc/auto.net menu.hint_netfs_automount_write Uloženie autopripojených záznamov a zapísanie %s
menu.hint_netfs_fstab_domount Pripojenie fstab záznamov menu.hint_netfs_fstab_domount Pripojenie fstab záznamov
menu.hint_netfs_fstab_doumount Odpojenie fstab záznamov menu.hint_netfs_fstab_doumount Odpojenie fstab záznamov
menu.hint_netfs_fstab_write Uloženie fstab záznamov a zapísanie /etc/fstab menu.hint_netfs_fstab_write Uloženie fstab záznamov a zapísanie %s
menu.hint_netfs_menu_main_automount Konfigurácia automount záznamov menu.hint_netfs_menu_main_automount Konfigurácia automount záznamov
menu.hint_netfs_menu_main_fstab Konfigurácia fstab záznamov menu.hint_netfs_menu_main_fstab Konfigurácia fstab záznamov
menu.hint_netfs_menu_main_head Fstab a automount konfigurácia menu.hint_netfs_menu_main_head Fstab a automount konfigurácia
@@ -2100,18 +2100,18 @@ mpkey.time Zobrazenie času
netfs.active_onoff Aktivovať netfs.active_onoff Aktivovať
netfs.automount_edit Upraviť auto.net netfs.automount_edit Upraviť auto.net
netfs.automount_head NetFS nastavenia netfs.automount_head NetFS nastavenia
netfs.automount_intro /etc/auto.net záznamov netfs.automount_intro auto.net záznamov
netfs.automount_intro_mounts Upraviť NetFS pripojenia netfs.automount_intro_mounts Upraviť NetFS pripojenia
netfs.automount_write Uložiť nastavenia a uložiť auto.net netfs.automount_write Uložiť nastavenia a uložiť auto.net
netfs.automount_write_info Súbor auto.net uložený netfs.automount_write_info Súbor auto.net uložený
netfs.dump Výpis netfs.dump Výpis
netfs.fstab_edit Upraviť fstab netfs.fstab_edit Upraviť fstab
netfs.fstab_domount Pripojiť NetFS zložku netfs.fstab_domount Pripojiť NetFS zložku
netfs.fstab_domount_info NGfstab beží netfs.fstab_domount_info '/etc/init.d/fstab start_netfs' beží
netfs.fstab_doumount Odpojiť NetFS zložku netfs.fstab_doumount Odpojiť NetFS zložku
netfs.fstab_doumount_info NGfstab beží netfs.fstab_doumount_info '/etc/init.d/fstab start_netfs' beží
netfs.fstab_head NetFS nastavenia netfs.fstab_head NetFS nastavenia
netfs.fstab_intro /etc/fstab záznamy netfs.fstab_intro fstab záznamy
netfs.fstab_intro_mounts Upraviť NetFS pripojenia netfs.fstab_intro_mounts Upraviť NetFS pripojenia
netfs.fstab_write Uložiť nastavenia a uloženie fstab netfs.fstab_write Uložiť nastavenia a uloženie fstab
netfs.fstab_write_info Súbor fstab uložený netfs.fstab_write_info Súbor fstab uložený

2
data/scripts/backup.sh
View File

@@ -8,9 +8,7 @@ USRF="/var/tuxbox/config/tobackup.conf"
BAKF="$1/${2:-settings_${HOST}_${DATE}.tar.gz}" BAKF="$1/${2:-settings_${HOST}_${DATE}.tar.gz}"
TOBACKUP="\ TOBACKUP="\
/etc/auto.net \
/etc/exports \ /etc/exports \
/etc/fstab \
/etc/hostname \ /etc/hostname \
/etc/network/interfaces \ /etc/network/interfaces \
/etc/passwd \ /etc/passwd \

2
data/scripts/backup_flash.sh
View File

@@ -7,7 +7,7 @@ VAR="/var/"
USRF="/var/tuxbox/config/tobackup.conf" USRF="/var/tuxbox/config/tobackup.conf"
BAKF="/var/backup_flash.tar.gz" BAKF="/var/backup_flash.tar.gz"
TOBACKUP="/etc/auto.net*" TOBACKUP=""
SHOWINFO "backup to ${BAKF} ..." SHOWINFO "backup to ${BAKF} ..."

4
data/y-web/Y_NI_Menue.yhtm
View File

@@ -11,8 +11,8 @@
<li><a target="work" href="Y_NI_Infoicons-control.yhtm">{=L:ni.infoicons-control=}</a></li> <li><a target="work" href="Y_NI_Infoicons-control.yhtm">{=L:ni.infoicons-control=}</a></li>
<li>{=L:ni.netfs-control=}</li> <li>{=L:ni.netfs-control=}</li>
<ul style="margin-left: 1em"> <ul style="margin-left: 1em">
<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab">{=if-file-exists:/var/etc/fstab~/var/etc/fstab~/etc/fstab=}</a></li> <li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab">/var/etc/fstab</a></li>
<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount">{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}</a></li> <li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount">/var/etc/auto.net</a></li>
</ul> </ul>
<li><a target="work" href="Y_NI_Plugin-control.yhtm">{=L:ni.plugin-control=}</a></li> <li><a target="work" href="Y_NI_Plugin-control.yhtm">{=L:ni.plugin-control=}</a></li>
<li><a target="work" href="Y_NI_Camd-control.yhtm">{=L:ni.camd-control=}</a></li> <li><a target="work" href="Y_NI_Camd-control.yhtm">{=L:ni.camd-control=}</a></li>

5
data/y-web/Y_Settings_automount.yhtm
View File

@@ -4,7 +4,7 @@
//<![CDATA[ //<![CDATA[
function automount_edit() function automount_edit()
{ {
var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}&{=R1=}"); var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&/var/etc/auto.net&{=R1=}");
mstr = mstr.replace(/\t/gi," "); mstr = mstr.replace(/\t/gi," ");
mstr = mstr.replace(/[ ]+/gi," "); mstr = mstr.replace(/[ ]+/gi," ");
@@ -108,8 +108,7 @@ function do_save2()
show_waitbox(false); show_waitbox(false);
mstr = mstr.replace(/=/gi,",,"); mstr = mstr.replace(/=/gi,",,");
//NI var _url ="/control/exec?Y_Tools&automount_setline&/var/etc/auto.net&"+mountname+"&"+mstr; var _url ="/control/exec?Y_Tools&automount_setline&/var/etc/auto.net&"+mountname+"&"+mstr;
var _url ="/control/exec?Y_Tools&automount_setline&{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}&"+mountname+"&"+mstr;
var res = loadSyncURL(_url); var res = loadSyncURL(_url);
window.document.location.href="/Y_Settings_automount_liste.yhtm"; window.document.location.href="/Y_Settings_automount_liste.yhtm";
} }

4
data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
View File

@@ -55,8 +55,8 @@ case "$1" in
if [ -e /etc/smb.conf ]; then if [ -e /etc/smb.conf ]; then
do_cmd 'Samba Server configuration' cat /etc/smb.conf do_cmd 'Samba Server configuration' cat /etc/smb.conf
fi fi
if [ -e /etc/auto.net ]; then if [ -e /var/etc/auto.net ]; then
do_cmd 'auto mounter configuration' cat /etc/auto.net do_cmd 'auto mounter configuration' cat /var/etc/auto.net
fi fi
fi fi
;; ;;

2
data/y-web/scripts/Y_Tools.sh
View File

@@ -306,7 +306,7 @@ do_automount_getline()
do_automount_setline() do_automount_setline()
{ {
if ! [ -e $1 ]; then if ! [ -e $1 ]; then
cp /etc/auto.net $1 cp /var/etc/auto.net $1
fi fi
filename=$1 filename=$1
mountname=`echo "$2"|sed -e "s;---;;g"` mountname=`echo "$2"|sed -e "s;---;;g"`

13
src/gui/netfs_setup.cpp
View File

@@ -57,17 +57,8 @@ CNETFSMountGui::CNETFSMountGui()
width = 50; width = 50;
fstabPath = checkVarPath("/etc/fstab"); fstabPath = "/var/etc/fstab";
autoPath = checkVarPath("/etc/auto.net"); autoPath = "/var/etc/auto.net";
}
std::string CNETFSMountGui::checkVarPath(const std::string &file)
{
std::string var = "/var" + file;
if(file_exists(var.c_str()))
return(var);
else
return(file);
} }
std::string CNETFSMountGui::getEntryString(int mt, int i) std::string CNETFSMountGui::getEntryString(int mt, int i)

1
src/gui/netfs_setup.h
View File

@@ -46,7 +46,6 @@ class CNETFSMountGui : public CMenuTarget
CFSMounter::FS_Support m_cifs_sup; CFSMounter::FS_Support m_cifs_sup;
int vinit(int mt); int vinit(int mt);
std::string checkVarPath(const std::string &file); /// returns path for persistent var partitions
protected: protected:
int width; int width;