From f6876a8e40981635c3b68d7b36234306474ce37d Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 3 Dec 2014 17:41:30 +0100 Subject: [PATCH] Add faxgetty services to daemontools as upstart doesn't support inittab --- createlinks | 18 +++++++++++++++++- .../configuration/defaults/faxgetty-iax/status | 1 + .../configuration/defaults/faxgetty-iax/type | 1 + .../defaults/faxgetty-iax2/status | 1 + .../configuration/defaults/faxgetty-iax2/type | 1 + root/var/service/faxgetty-iax/log/run | 7 +++++++ root/var/service/faxgetty-iax/run | 9 +++++++++ root/var/service/faxgetty-iax2/log/run | 7 +++++++ root/var/service/faxgetty-iax2/run | 9 +++++++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 root/etc/e-smith/db/configuration/defaults/faxgetty-iax/status create mode 100644 root/etc/e-smith/db/configuration/defaults/faxgetty-iax/type create mode 100644 root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/status create mode 100644 root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/type create mode 100644 root/var/service/faxgetty-iax/log/run create mode 100644 root/var/service/faxgetty-iax/run create mode 100644 root/var/service/faxgetty-iax2/log/run create mode 100644 root/var/service/faxgetty-iax2/run diff --git a/createlinks b/createlinks index 39350e2..fc4aab5 100644 --- a/createlinks +++ b/createlinks @@ -5,20 +5,36 @@ use esmith::Build::CreateLinks qw(:all); service_link_enhanced("iaxmodem", "S95", "7"); service_link_enhanced("iaxmodem", "K05", "6"); service_link_enhanced("iaxmodem", "K05", "0"); +service_link_enhanced("iaxmodem2", "S95", "7"); +service_link_enhanced("iaxmodem2", "K05", "6"); +service_link_enhanced("iaxmodem2", "K05", "0"); +service_link_enhanced("faxgetty-iax", "S96", "7"); +service_link_enhanced("faxgetty-iax", "K03", "6"); +service_link_enhanced("faxgetty-iax", "K03", "0"); +service_link_enhanced("faxgetty-iax2", "S96", "7"); +service_link_enhanced("faxgetty-iax2", "K03", "6"); +service_link_enhanced("faxgetty-iax2", "K03", "0"); safe_symlink("restart", "root/etc/e-smith/events/fax-update/services2adjust/hylafax"); safe_symlink("restart", "root/etc/e-smith/events/fax-update/services2adjust/iaxmodem"); safe_symlink("restart", "root/etc/e-smith/events/fax-update/services2adjust/iaxmodem2"); +safe_symlink("restart", "root/etc/e-smith/events/fax-update/services2adjust/faxgetty-iax"); +safe_symlink("restart", "root/etc/e-smith/events/fax-update/services2adjust/faxgetty-iax2"); templates2events("/etc/iaxmodem/iaxmodem-cfg.ttyIAX", qw(fax-update bootstrap-console-save)); templates2events("/etc/iaxmodem/iaxmodem-cfg.ttyIAX2", qw(fax-update bootstrap-console-save)); -templates2events("/etc/inittab", qw(fax-update)); safe_touch("root/var/service/iaxmodem/down"); safe_touch("root/var/service/iaxmodem2/down"); +safe_touch("root/var/service/faxgetty-iax/down"); +safe_touch("root/var/service/faxgetty-iax2/down"); safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/iaxmodem'); safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/iaxmodem2'); +safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/faxgetty-iax'); +safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/faxgetty-iax2'); safe_symlink("/var/service/iaxmodem" , 'root/service/iaxmodem'); safe_symlink("/var/service/iaxmodem2" , 'root/service/iaxmodem2'); +safe_symlink("/var/service/faxgetty-iax" , 'root/service/faxgetty-iax'); +safe_symlink("/var/service/faxgetty-iax2" , 'root/service/faxgetty-iax2'); diff --git a/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/status b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/status new file mode 100644 index 0000000..7a68b11 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/status @@ -0,0 +1 @@ +disabled diff --git a/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/type b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/type new file mode 100644 index 0000000..24e1098 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax/type @@ -0,0 +1 @@ +service diff --git a/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/status b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/status new file mode 100644 index 0000000..7a68b11 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/status @@ -0,0 +1 @@ +disabled diff --git a/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/type b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/type new file mode 100644 index 0000000..24e1098 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/faxgetty-iax2/type @@ -0,0 +1 @@ +service diff --git a/root/var/service/faxgetty-iax/log/run b/root/var/service/faxgetty-iax/log/run new file mode 100644 index 0000000..8c51332 --- /dev/null +++ b/root/var/service/faxgetty-iax/log/run @@ -0,0 +1,7 @@ +#!/bin/sh + +exec \ + /usr/local/bin/setuidgid smelog \ + /usr/local/bin/multilog t s5000000 \ + /var/log/faxgetty-iax + diff --git a/root/var/service/faxgetty-iax/run b/root/var/service/faxgetty-iax/run new file mode 100644 index 0000000..9e5990f --- /dev/null +++ b/root/var/service/faxgetty-iax/run @@ -0,0 +1,9 @@ +#!/bin/sh + +STATUS=$(/sbin/e-smith/db configuration getprop iaxmodem status || echo disabled) + +if [ "$STATUS" != "enabled" ]; then + sv d . +fi + +exec /usr/sbin/faxgetty ttyIAX diff --git a/root/var/service/faxgetty-iax2/log/run b/root/var/service/faxgetty-iax2/log/run new file mode 100644 index 0000000..9334686 --- /dev/null +++ b/root/var/service/faxgetty-iax2/log/run @@ -0,0 +1,7 @@ +#!/bin/sh + +exec \ + /usr/local/bin/setuidgid smelog \ + /usr/local/bin/multilog t s5000000 \ + /var/log/faxgetty-iax2 + diff --git a/root/var/service/faxgetty-iax2/run b/root/var/service/faxgetty-iax2/run new file mode 100644 index 0000000..8aefa99 --- /dev/null +++ b/root/var/service/faxgetty-iax2/run @@ -0,0 +1,9 @@ +#!/bin/sh + +STATUS=$(/sbin/e-smith/db configuration getprop iaxmodem2 status || echo disabled) + +if [ "$STATUS" != "enabled" ]; then + sv d . +fi + +exec /usr/sbin/faxgetty ttyIAX2