Message ID | 20180620210021.12253-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Commit | fe03f5231f84c353914d66baef584014fcfb99f3 |
Headers | show |
Series | [1/1] apache: add init sysv script | expand |
> From: "Fabrice Fontaine" <fontaine.fabrice@gmail.com> > To: "buildroot" <buildroot@buildroot.org> > Cc: "Fabrice Fontaine" <fontaine.fabrice@gmail.com> > Sent: Wednesday, June 20, 2018 6:00:21 PM > Subject: [Buildroot] [PATCH 1/1] apache: add init sysv script > sysv init script is just a wrapper to apachectl > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/apache/S50apache | 12 ++++++++++++ > package/apache/apache.mk | 5 +++++ > 2 files changed, 17 insertions(+) > create mode 100644 package/apache/S50apache > > diff --git a/package/apache/S50apache b/package/apache/S50apache > new file mode 100644 > index 0000000000..623a7eef3b > --- /dev/null > +++ b/package/apache/S50apache > @@ -0,0 +1,12 @@ > +#!/bin/sh > + > +case "$1" in > + start|restart|graceful|graceful-stop|stop) > + apachectl -k $1 > + ;; > + *) > + echo "Usage: $0 {start|restart|graceful|graceful-stop|stop}" > + exit 1 > +esac > + > +exit $? > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index 23414fe44d..f4c522916e 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -92,4 +92,9 @@ define APACHE_CLEANUP_TARGET > endef > APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET > > +define APACHE_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 package/apache/S50apache \ > + $(TARGET_DIR)/etc/init.d/S50apache > +endef > + > $(eval $(autotools-package)) > -- > 2.14.1 Tested-by: Carlos Santos <casantos@datacom.com.br> Built a VM and tested all options. Looks good to me. Do you intend to add the corresponding systemd service configuration?
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > sysv init script is just a wrapper to apachectl > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed, thanks.
On 20-06-18 23:00, Fabrice Fontaine wrote: > sysv init script is just a wrapper to apachectl > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/apache/S50apache | 12 ++++++++++++ > package/apache/apache.mk | 5 +++++ > 2 files changed, 17 insertions(+) > create mode 100644 package/apache/S50apache > > diff --git a/package/apache/S50apache b/package/apache/S50apache > new file mode 100644 > index 0000000000..623a7eef3b > --- /dev/null > +++ b/package/apache/S50apache > @@ -0,0 +1,12 @@ > +#!/bin/sh > + > +case "$1" in > + start|restart|graceful|graceful-stop|stop) > + apachectl -k $1 > + ;; > + *) > + echo "Usage: $0 {start|restart|graceful|graceful-stop|stop}" In our "init script standardisation" effort, I think the idea was to always support start, stop, restart and reload. Could you add a reload command that maps onto restart? Regards, Arnout > + exit 1 > +esac > + > +exit $? > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index 23414fe44d..f4c522916e 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -92,4 +92,9 @@ define APACHE_CLEANUP_TARGET > endef > APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET > > +define APACHE_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 package/apache/S50apache \ > + $(TARGET_DIR)/etc/init.d/S50apache > +endef > + > $(eval $(autotools-package)) >
diff --git a/package/apache/S50apache b/package/apache/S50apache new file mode 100644 index 0000000000..623a7eef3b --- /dev/null +++ b/package/apache/S50apache @@ -0,0 +1,12 @@ +#!/bin/sh + +case "$1" in + start|restart|graceful|graceful-stop|stop) + apachectl -k $1 + ;; + *) + echo "Usage: $0 {start|restart|graceful|graceful-stop|stop}" + exit 1 +esac + +exit $? diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 23414fe44d..f4c522916e 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -92,4 +92,9 @@ define APACHE_CLEANUP_TARGET endef APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET +define APACHE_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/apache/S50apache \ + $(TARGET_DIR)/etc/init.d/S50apache +endef + $(eval $(autotools-package))
sysv init script is just a wrapper to apachectl Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/apache/S50apache | 12 ++++++++++++ package/apache/apache.mk | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 package/apache/S50apache