4 Commits

5 changed files with 23 additions and 3 deletions

View File

@@ -26,7 +26,7 @@ STAGES = \
script/3 \ script/3 \
script/ctrlaltdel script/ctrlaltdel
RCLOCAL = script/rc.local RCLOCAL = script/rc.local script/rc.shutdown
AGETTY_CONSOLE = $(wildcard sv/agetty-console/*) AGETTY_CONSOLE = $(wildcard sv/agetty-console/*)
AGETTY_CONSOLE_S = supervise.agetty-console AGETTY_CONSOLE_S = supervise.agetty-console
@@ -91,6 +91,7 @@ EDIT = sed \
-e "s|@SERVICEDIR[@]|$(SERVICEDIR)|g" \ -e "s|@SERVICEDIR[@]|$(SERVICEDIR)|g" \
-e "s|@RUNSVDIR[@]|$(RUNSVDIR)|g" \ -e "s|@RUNSVDIR[@]|$(RUNSVDIR)|g" \
-e "s|@RUNDIR[@]|$(RUNDIR)|g" \ -e "s|@RUNDIR[@]|$(RUNDIR)|g" \
-e "s|@SYSCONFDIR[@]|$(SYSCONFDIR)|g" \
-e "s|@RCLIBDIR[@]|$(RCLIBDIR)|g" -e "s|@RCLIBDIR[@]|$(RCLIBDIR)|g"
%: %.in Makefile %: %.in Makefile
@@ -119,6 +120,7 @@ install-runit:
install -d $(DESTDIR)$(RCDIR) install -d $(DESTDIR)$(RCDIR)
install -m755 $(RCLOCAL) $(DESTDIR)$(RCDIR) install -m755 $(RCLOCAL) $(DESTDIR)$(RCDIR)
install -m755 $(RCLOCAL) $(DESTDIR)$(SYSCONFDIR)
install -d $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(BINDIR)
install -m755 $(BIN) $(DESTDIR)$(BINDIR) install -m755 $(BIN) $(DESTDIR)$(BINDIR)

View File

@@ -10,7 +10,13 @@ for arg in $(cat /proc/cmdline); do
fi fi
done done
[ -x @RCDIR@/rc.local ] && @RCDIR@/rc.local if [ -x @RCDIR@/rc.local ] && grep -qv '^#' @RCDIR@/rc.local; then
@RCDIR@/rc.local
echo "==> @RCDIR@/rc.local has been deprecated. Please move the contents"
echo " of the file to @SYSCONFDIR@/rc.local, since the next version of"
echo " runit-artix won't read @RCDIR@/rc.local anymore."
fi
[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
runsvchdir "${runlevel}" runsvchdir "${runlevel}"
ln -s @RUNSVDIR@/current @SERVICEDIR@ ln -s @RUNSVDIR@/current @SERVICEDIR@

View File

@@ -11,6 +11,14 @@ stat_busy "Exit services ..."
sv exit @RUNDIR@/service/* sv exit @RUNDIR@/service/*
stat_done stat_done
if [ -x @RCDIR@/rc.shutdown ] && grep -qv '^#' @RCDIR@/rc.shutdown; then
@RCDIR@/rc.shutdown
echo "==> @RCDIR@/rc.shutdown has been depreacted. Please move the contents"
echo " of the file to @SYSCONFDIR@/rc.shutdown since the next version of"
echo " runit-artix won't read @RCDIR@/rc.shutdown anymore."
fi
[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
if [ -e @RUNDIR@/reboot ]; then if [ -e @RUNDIR@/reboot ]; then
chmod 100 @RUNDIR@/reboot chmod 100 @RUNDIR@/reboot
fi fi

View File

@@ -1,4 +1,4 @@
# @RCDIR@/rc.local -- rc.local for Artix Linux # @SYSCONFDIR@/rc.local -- rc.local for Artix Linux
# #
# Enter your custom commands here. It will be executed on stage 2 # Enter your custom commands here. It will be executed on stage 2
# before running services. # before running services.

4
script/rc.shutdown.in Normal file
View File

@@ -0,0 +1,4 @@
# @SYSCONFDIR@/rc.shutdown -- rc.shutdown for Artix Linux
#
# Enter your custom commands here. It will be executed on stage 3
# after stopping services.