artix/runit-artix
19
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Compare commits

base: artix:20200101
Branches Tags
artix:master artix:new-rc
artix:20210904 artix:20210414 artix:20210413 artix:20200905-3 artix:20200905-2 artix:20200905 artix:20200825 artix:20200803 artix:20200108 artix:20200101-1 artix:20200101 artix:20190212 artix:20180730 artix:20180509 artix:20180507 artix:20180506 artix:20180505.3 artix:20180505.2 artix:20180505 artix:20180414 artix:20180327 artix:20180112 artix:20180108 artix:20171208 artix:20170818
...
compare: artix:20200825
Branches Tags
artix:master artix:new-rc
artix:20210904 artix:20210414 artix:20210413 artix:20200905-3 artix:20200905-2 artix:20200905 artix:20200825 artix:20200803 artix:20200108 artix:20200101-1 artix:20200101 artix:20190212 artix:20180730 artix:20180509 artix:20180507 artix:20180506 artix:20180505.3 artix:20180505.2 artix:20180505 artix:20180414 artix:20180327 artix:20180112 artix:20180108 artix:20171208 artix:20170818

8 Commits
20200101 ... 20200825

Author SHA1 Message Date
Muhammad Herdiansyah
397b46ff3f runit-artix: move rc.local and rc.shutdown to sysconfdir 2020-08-25 08:02:23 +07:00
Muhammad Herdiansyah
ee63bf4a06 2/3: remove all deprecated files and add new OpenRC compatibility 2020-08-25 08:00:11 +07:00
Muhammad Herdiansyah
bcd456603b 3: actually run rc.shutdown instead of rc.local, oops 2020-08-25 07:58:05 +07:00
Érico Rolim
c75de34303 ctrlaltdel: trigger a reboot properly. 
/run/runit/{stopit,reboot} should have their perms set to 100 by
ctrlaltdel, before runit signals itself with SIGCONT, in order to
trigger a reboot. This script can be changed by a user to perform
different actions. The comments in it explain what each file is for.

Patch created for Void, imported to Artix.
 2020-08-03 23:01:04 +07:00
Érico Rolim
6453301c3b 3: remove /run/runit/reboot handling. 
runit uses the permissions in the /etc/runit/reboot file to determine
whether it's going to perform a halt or reboot action. This conditional
in 3 meant that touching the reboot file, even with 000 perms, would
lead to a reboot, which goes agains what is expected according to the
runit documentation.

Patch made for Void, imported to Artix.
 2020-08-03 23:00:29 +07:00
Érico Rolim
454078d6a0 1: only create /run/runit directory. 
The 100 permission in /run/runit/stopit made it so that signaling runit
with SIGCONT would shut the system down. To achieve the correct
behavior, we should create the stopit and reboot files with 000 perms,
and allow their permissions to be set correctly by calls to `init 0` or
`init 6` or by /etc/runit/ctrlaltdel.

Patch created for Void, imported to Artix.
 2020-08-03 22:59:27 +07:00
Muhammad Herdiansyah
05801e2283 don't install rc.local -- let users create their own 2020-01-08 15:58:01 +07:00
Muhammad Herdiansyah
f84f50c4e9 fix deprecation message 2020-01-01 09:49:40 +07:00
5 changed files with 18 additions and 20 deletions
Expand all files Collapse all files

3
Makefile
View File

@@ -118,8 +118,7 @@ install-runit:
$(LN) $(RUNDIR)/reboot $(DESTDIR)$(RUNITDIR)/ $(LN) $(RUNDIR)/reboot $(DESTDIR)$(RUNITDIR)/
$(LN) $(RUNDIR)/stopit $(DESTDIR)$(RUNITDIR)/ $(LN) $(RUNDIR)/stopit $(DESTDIR)$(RUNITDIR)/
install -d $(DESTDIR)$(RCDIR) install -d $(DESTDIR)$(SYSCONFDIR)
install -m755 $(RCLOCAL) $(DESTDIR)$(RCDIR)
install -m755 $(RCLOCAL) $(DESTDIR)$(SYSCONFDIR) install -m755 $(RCLOCAL) $(DESTDIR)$(SYSCONFDIR)
install -d $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(BINDIR)

3
script/1.in
View File

@@ -6,6 +6,7 @@ PATH=/usr/bin:/usr/sbin
run_sysinit run_sysinit
install -m100 /dev/null @RUNDIR@/stopit install -m000 /dev/null @RUNDIR@/stopit
install -m000 /dev/null @RUNDIR@/reboot
status "Initialization complete" status "Initialization complete"

12
script/2.in
View File

@@ -10,13 +10,13 @@ for arg in $(cat /proc/cmdline); do
fi fi
done done
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 [ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
# OpenRC compatibility
for script in /etc/local.d/*.start; do
[ -x "$script" ] && "$script"
done
runsvchdir "${runlevel}" runsvchdir "${runlevel}"
ln -s @RUNSVDIR@/current @SERVICEDIR@ ln -s @RUNSVDIR@/current @SERVICEDIR@

15
script/3.in
View File

@@ -11,17 +11,12 @@ 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 # OpenRC compatibility
@RCDIR@/rc.shutdown for script in /etc/local.d/*.stop; do
echo "==> @RCDIR@/rc.shutdown has been depreacted. Please move the contents" [ -x "$script" ] && "$script"
echo " of the file to @SYSCONFDIR@/rc.shutdown since the next version of" done
echo " runit-artix won't read @RCDIR@/rc.shutdown anymore."
fi
[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
if [ -e @RUNDIR@/reboot ]; then [ -x @SYSCONFDIR@/rc.shutdown ] && @SYSCONFDIR@/rc.shutdown
chmod 100 @RUNDIR@/reboot
fi
run_shutdown run_shutdown

5
script/ctrlaltdel.in
View File

@@ -3,8 +3,11 @@
PATH=/usr/bin:/usr/sbin PATH=/usr/bin:/usr/sbin
MSG="System is going down..." MSG="System is going down..."
# We check for this file after receiving a SIGCONT to move to stage3
chmod 100 @RUNDIR@/stopit
# We check for this file in stage3 to halt or reboot # We check for this file in stage3 to halt or reboot
touch @RUNDIR@/reboot chmod 100 @RUNDIR@/reboot
# Proceed with shutdown process # Proceed with shutdown process
echo "$MSG" | wall echo "$MSG" | wall