From 0f55856e02b30c9cc41df0c75bccf7f2881cfe93 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 27 Jan 2022 17:55:56 +0100 Subject: contrib: update --- contrib/README | 2 ++ contrib/rvnit-init | 12 ------------ contrib/rvnit/00Kpoweroff | 11 ----------- contrib/rvnit/01Kremount | 9 +++++++++ contrib/rvnit/02Kkillall | 9 +++++++++ contrib/rvnit/04Dudevd | 18 ++++++++++++++++++ contrib/rvnit/04Kudev | 2 ++ contrib/rvnit/04Sudev | 23 ----------------------- contrib/rvnit/05Sudev | 22 ++++++++++++++++++++++ contrib/rvnit/08Kmisc | 2 ++ contrib/rvnit/10Sbash | 3 +++ contrib/rvnit/11Sslow | 5 +++++ contrib/rvnit/21Glog | 3 +++ contrib/rvnit/30Dudevd | 3 --- contrib/rvnit/90Dagetty-tty1 | 3 +++ 15 files changed, 78 insertions(+), 49 deletions(-) delete mode 100755 contrib/rvnit-init delete mode 100755 contrib/rvnit/00Kpoweroff create mode 100755 contrib/rvnit/01Kremount create mode 100755 contrib/rvnit/02Kkillall create mode 100755 contrib/rvnit/04Dudevd create mode 100755 contrib/rvnit/04Kudev delete mode 100755 contrib/rvnit/04Sudev create mode 100755 contrib/rvnit/05Sudev create mode 100755 contrib/rvnit/08Kmisc create mode 100644 contrib/rvnit/10Sbash create mode 100644 contrib/rvnit/11Sslow create mode 100755 contrib/rvnit/21Glog delete mode 100755 contrib/rvnit/30Dudevd create mode 100755 contrib/rvnit/90Dagetty-tty1 diff --git a/contrib/README b/contrib/README index 09bd6b7..1d78f51 100644 --- a/contrib/README +++ b/contrib/README @@ -1,2 +1,4 @@ This directory contains totally unsupported scripts to boot Void Linux with rvnit. + +Use init=/usr/bin/rvnit diff --git a/contrib/rvnit-init b/contrib/rvnit-init deleted file mode 100755 index 96786ea..0000000 --- a/contrib/rvnit-init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -PATH=/usr/bin:/usr/sbin -export PATH - -# control tty -exec /dev/tty1 2>&1 - -mountpoint -q /proc || mount -o nosuid,noexec,nodev -t proc proc /proc -mountpoint -q /run || mount -o mode=0755,nosuid,nodev -t tmpfs run /run - -ctrlaltdel soft -exec /bin/rvnit /etc/rvnit diff --git a/contrib/rvnit/00Kpoweroff b/contrib/rvnit/00Kpoweroff deleted file mode 100755 index 2fae082..0000000 --- a/contrib/rvnit/00Kpoweroff +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -echo system halted. -sync - -sleep 10 - -if [ -n "$RVNIT_WANT_REBOOT" ]; then - reboot -f -else - halt -f -fi diff --git a/contrib/rvnit/01Kremount b/contrib/rvnit/01Kremount new file mode 100755 index 0000000..a2559f3 --- /dev/null +++ b/contrib/rvnit/01Kremount @@ -0,0 +1,9 @@ +#!/bin/sh +set -x + +fuser -v -m / 2>&1 |grep F +sleep 1 + +swapoff -a +umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs +mount -o remount,ro / diff --git a/contrib/rvnit/02Kkillall b/contrib/rvnit/02Kkillall new file mode 100755 index 0000000..c6e59f1 --- /dev/null +++ b/contrib/rvnit/02Kkillall @@ -0,0 +1,9 @@ +#!/bin/sh +exec 1>&2 +set -x +ps ax +pkill --inverse -s0,1 -TERM +sleep 1 +pkill --inverse -s0,1 -KILL +sleep 1 +ps ax diff --git a/contrib/rvnit/04Dudevd b/contrib/rvnit/04Dudevd new file mode 100755 index 0000000..318c7e8 --- /dev/null +++ b/contrib/rvnit/04Dudevd @@ -0,0 +1,18 @@ +#!/bin/sh + +. /etc/runit/functions + +# vim: set ts=4 sw=4 et: + +[ -n "$VIRTUALIZATION" ] && return 0 + +if [ -x /usr/lib/systemd/systemd-udevd ]; then + _udevd=/usr/lib/systemd/systemd-udevd +elif [ -x /sbin/udevd -o -x /bin/udevd ]; then + _udevd=udevd +else + msg_warn "cannot find udevd!" + exit 111 +fi + +exec ${_udevd} 2>&1 diff --git a/contrib/rvnit/04Kudev b/contrib/rvnit/04Kudev new file mode 100755 index 0000000..b9cdb84 --- /dev/null +++ b/contrib/rvnit/04Kudev @@ -0,0 +1,2 @@ +#!/bin/sh +udevadm control --exit diff --git a/contrib/rvnit/04Sudev b/contrib/rvnit/04Sudev deleted file mode 100755 index d1b0697..0000000 --- a/contrib/rvnit/04Sudev +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -. /etc/runit/functions - -# vim: set ts=4 sw=4 et: - -[ -n "$VIRTUALIZATION" ] && return 0 - -if [ -x /usr/lib/systemd/systemd-udevd ]; then - _udevd=/usr/lib/systemd/systemd-udevd -elif [ -x /sbin/udevd -o -x /bin/udevd ]; then - _udevd=udevd -else - msg_warn "cannot find udevd!" -fi - -if [ -n "${_udevd}" ]; then - msg "Starting udev and waiting for devices to settle..." - ${_udevd} --daemon - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -fi diff --git a/contrib/rvnit/05Sudev b/contrib/rvnit/05Sudev new file mode 100755 index 0000000..fa910ff --- /dev/null +++ b/contrib/rvnit/05Sudev @@ -0,0 +1,22 @@ +#!/bin/sh + +. /etc/runit/functions + +# vim: set ts=4 sw=4 et: + +[ -n "$VIRTUALIZATION" ] && return 0 + +if [ -x /usr/lib/systemd/systemd-udevd ]; then + _udevd=/usr/lib/systemd/systemd-udevd +elif [ -x /sbin/udevd -o -x /bin/udevd ]; then + _udevd=udevd +else + msg_warn "cannot find udevd!" +fi + +if [ -n "${_udevd}" ]; then + msg "Waiting for devices to settle..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +fi diff --git a/contrib/rvnit/08Kmisc b/contrib/rvnit/08Kmisc new file mode 100755 index 0000000..80f89c0 --- /dev/null +++ b/contrib/rvnit/08Kmisc @@ -0,0 +1,2 @@ +#!/bin/sh +halt -w # for wtmp diff --git a/contrib/rvnit/10Sbash b/contrib/rvnit/10Sbash new file mode 100644 index 0000000..94d1f2f --- /dev/null +++ b/contrib/rvnit/10Sbash @@ -0,0 +1,3 @@ +#!/bin/sh + +bash diff --git a/contrib/rvnit/11Sslow b/contrib/rvnit/11Sslow new file mode 100644 index 0000000..cbee673 --- /dev/null +++ b/contrib/rvnit/11Sslow @@ -0,0 +1,5 @@ +#!/bin/bash + +set -e +trap bash INT ERR +sleep 30 diff --git a/contrib/rvnit/21Glog b/contrib/rvnit/21Glog new file mode 100755 index 0000000..dca879a --- /dev/null +++ b/contrib/rvnit/21Glog @@ -0,0 +1,3 @@ +#!/bin/sh + +exec svlogd /var/log/mysocklog/* diff --git a/contrib/rvnit/30Dudevd b/contrib/rvnit/30Dudevd deleted file mode 100755 index a3a396b..0000000 --- a/contrib/rvnit/30Dudevd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -udevadm control --exit -exec udevd 2>&1 diff --git a/contrib/rvnit/90Dagetty-tty1 b/contrib/rvnit/90Dagetty-tty1 new file mode 100755 index 0000000..d0931fe --- /dev/null +++ b/contrib/rvnit/90Dagetty-tty1 @@ -0,0 +1,3 @@ +#!/bin/sh +tty=${0##*-} +exec agetty --noclear "${tty}" 38400 linux -- cgit 1.4.1