freeze code base to release 1.4.1
This commit is contained in:
arcan1s
2015-03-18 03:33:30 +03:00
parent 308f9824b4
commit 9aa1f6d715
21 changed files with 698 additions and 494 deletions

View File

@ -67,6 +67,9 @@ CTRL_DIR=/run/wpa_supplicant
CTRL_GROUP=users
[Other]
# path to external editor
# This option is not recognized by netctlgui-helper
EDITOR_PATH=/usr/bin/gvim
# path to directory which contains interface information
IFACE_DIR=/sys/class/net/
# path to directory with rfkill devices.

View File

@ -32,6 +32,9 @@ force use
for helper instead of using
.BR setuid (3)
to child processes
.IP "EDITOR_PATH=/usr/bin/gvim"
path to an external editor. This option is not recognized by
.BR netctlgui-helper (1)
.IP "HELPER_PATH=/usr/bin/netctlgui-helper"
path to
.BR netctlgui-helper (1)

View File

@ -184,6 +184,7 @@ QMap<QString, QString> NetctlHelper::getSettings(const QString file)
settings.endGroup();
settings.beginGroup(QString("Other"));
config[QString("EDITOR_PATH")] = settings.value(QString("EDITOR_PATH"), QString("/usr/bin/gvim")).toString();
config[QString("IFACE_DIR")] = settings.value(QString("IFACE_DIR"), QString("/sys/class/net/")).toString();
config[QString("RFKILL_DIR")] = settings.value(QString("RFKILL_DIR"), QString("/sys/class/rfkill/")).toString();
config[QString("PREFERED_IFACE")] = settings.value(QString("PREFERED_IFACE"), QString("")).toString();