summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/rl-system.init31
-rw-r--r--templates/service/telnet/allow-root/node.def10
-rw-r--r--templates/service/telnet/port/node.def2
3 files changed, 39 insertions, 4 deletions
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 8d933b2d..779a7610 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -167,6 +167,16 @@ write_iftab ()
rm -f $IFTAB
for i in ${!cfg_eth_hwid[@]} ; do
+ echo "etha$i mac ${cfg_eth_hwid[$i]}" >> $IFTAB
+ done
+}
+
+write_iftab_real ()
+{
+ local -i i
+
+ rm -f $IFTAB
+ for i in ${!cfg_eth_hwid[@]} ; do
echo "eth$i mac ${cfg_eth_hwid[$i]}" >> $IFTAB
done
}
@@ -194,7 +204,19 @@ add_bootfile_eth_hwid ()
}' $BOOTFILE
}
-update_bootfile_eth_hwid ()
+add_bootfile_eth_linkdetect ()
+{
+ local eth=$1
+
+ sed -i '/^interfaces {$/,/^}$/ {
+ /^}$/i\
+ ethernet '"$eth"' {\
+ link-detect\
+ }
+ }' $BOOTFILE
+}
+
+update_bootfile_eths ()
{
local -i i
@@ -203,6 +225,7 @@ update_bootfile_eth_hwid ()
mod_bootfile_eth_hwid eth$i ${cfg_eth_hwid[$i]}
else
add_bootfile_eth_hwid eth$i ${cfg_eth_hwid[$i]}
+ add_bootfile_eth_linkdetect eth$i
fi
done
}
@@ -234,13 +257,13 @@ itfmess ()
load_sys_vmnets
update_cfg_eth_hwid
write_iftab
- update_bootfile_eth_hwid
+ update_bootfile_eths
update_bootfile_vmnets
}
maybe_ifrename () {
if [ -e $IFTAB ] ; then
- ifrename -d -p -t
+ ifrename -d -p
fi
}
@@ -311,6 +334,8 @@ start () {
set_reboot_on_panic
itfmess
maybe_ifrename
+ write_iftab_real
+ maybe_ifrename
add_new_serial_if
reset_promiscous_arp_response
set_ip_forwarding
diff --git a/templates/service/telnet/allow-root/node.def b/templates/service/telnet/allow-root/node.def
new file mode 100644
index 00000000..654023af
--- /dev/null
+++ b/templates/service/telnet/allow-root/node.def
@@ -0,0 +1,10 @@
+type: bool
+default: false
+help: "Enable/disable root login"
+update: "if [ \"$(@)\" == \"true\" ]; then \
+ sudo mv -f /etc/securetty /etc/securetty.allow-root >&/dev/null; \
+ else
+ sudo mv -f /etc/securetty.allow-root /etc/securetty >&/dev/null; \
+ fi ; /bin/true"
+delete: "sudo mv -f /etc/securetty.allow-root /etc/securetty >&/dev/null ; \
+ /bin/true"
diff --git a/templates/service/telnet/port/node.def b/templates/service/telnet/port/node.def
index 0232af83..d9bbce6c 100644
--- a/templates/service/telnet/port/node.def
+++ b/templates/service/telnet/port/node.def
@@ -1,3 +1,3 @@
-type: u32
+type: u32
default: 23
help: "Port for telnet service"