commit 3baf11c2650862e375f2b514fc74b0d9fe6d03cc Author: Tim Biermann <tbier@posteo.de> Date: Sun Feb 27 21:42:18 2022 +0100 rc: 2.31 -> 2.32 diff --git a/rc/.signature b/rc/.signature index 9fd7f87b..7b3475a4 100644 --- a/rc/.signature +++ b/rc/.signature @@ -1,13 +1,13 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqbXBz4D0qn3M0vqrUc1uDN3tJkXy1Dl+W4mfD3HIiKciZUXVRRg8+tSxXZvIbFHZKQaHnyZnDihqUTy0O0uogg= -SHA256 (Pkgfile) = 48a3a61190846f6b835ceb0869ac6b9c04997f1b23c7a7766a8da755ff955cf7 +RWRJc1FUaeVeqlAdmqX2UJ3d59ZGtePm+u2Bkv0z1UfXQ8ZLBYfZmndXieRI3eC5Epn5F/UthU0eeVOAQTvIaYRARC68oxeawAY= +SHA256 (Pkgfile) = 879d4fefc0a9a43e691e5c3a13ad33c9ae2dedfecb611c08351e55a7e6553d08 SHA256 (.footprint) = 83ecef9b904362368a7a581a43b3ea9b658bdbe8265ffae433068ee5beba15e4 SHA256 (inittab) = 7914281a73ee7746c7c16fe63d1631f3714f63467f2655c550c5f8b7c2f1fee7 -SHA256 (rc) = 3a82a4a94829efdc3f890e4dc18513e857ef00b4b205bdc4f217556330a87f30 +SHA256 (rc) = 972b371297572fb70297f7c5c12ad8b70742ab89d0bc585d18601f3381ec3b74 SHA256 (rc.modules) = 74d94558fe68f2a4b7b0f3dc2215c291300bc416d27e6d79d95f303cfc918788 SHA256 (rc.single) = 14a7487258f3b5f2406a860c34666abacf23eb37962d80fce66e496dd111061a -SHA256 (rc.multi) = 2cd2c4dbf2ac86243f775a0020efac08f631b658800c00f8a1c0a3d31855f29a +SHA256 (rc.multi) = a8115a0c3ddd98a5ac1f6dc9d1f23e7d1c0d2db65f709f59deadac312ed6a618 SHA256 (rc.local) = e39147ee4d402b2fea96639185d6055b361b1a44090653acf5790b51db6acdd1 -SHA256 (rc.fix) = 6bc2e28e42d470e16d7d408bbd6b50164ae67388325702962c07a9a9228b91bd +SHA256 (rc.fix) = 0d2eef2326f8660e70e047192c82a0cb865bc8c933e12ffe5b817e8cd536f5b0 SHA256 (rc.shutdown) = 284122ae86248cf93e9806b6e1d3ffca9ad2ee3978434581b491e39887b14ec9 SHA256 (rc.conf) = 37c3b0dd2a76fe6fbdec9ec90bfbfa2e8e7db9cece2fceec1f4899aa1e3e14a5 diff --git a/rc/Pkgfile b/rc/Pkgfile index 4e88b113..bd640293 100644 --- a/rc/Pkgfile +++ b/rc/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=rc -version=2.31 -release=3 +version=2.32 +release=1 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf) build() { diff --git a/rc/rc b/rc/rc index 26b8ca08..36979e2c 100755 --- a/rc/rc +++ b/rc/rc @@ -52,16 +52,19 @@ fi /bin/mount -o remount,rw / /bin/mount -a -O no_netdev +# Create user dir in /run +/bin/mkdir /run/user +/bin/chmod 0755 /run/user + # Activate swap /sbin/swapon -a # Clean up misc files -: > /var/run/utmp +: > /run/utmp /bin/rm -rf /forcefsck /fastboot /etc/nologin /etc/shutdownpid -(cd /var/run && /usr/bin/find . -name "*.pid" -delete) (cd /var/lock && /usr/bin/find . ! -type d -delete) (cd /tmp && /usr/bin/find . ! -name . -delete) -/bin/mkdir -m 1777 /tmp/.ICE-unix +/bin/mkdir -m 1777 /tmp/.ICE-unix /tmp/.X11-unix # Set kernel variables /sbin/sysctl -p > /dev/null @@ -72,7 +75,7 @@ fi # Configure host name if [ "$HOSTNAME" ]; then echo "hostname: $HOSTNAME" - /bin/hostname $HOSTNAME + /bin/hostname "$HOSTNAME" fi # Load random seed @@ -80,20 +83,20 @@ fi # Configure system clock if [ "$TIMEZONE" ]; then - /bin/ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime + /bin/ln -snf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime fi /sbin/hwclock --hctosys # Load console font if [ "$FONT" ]; then echo "font: $FONT" - /usr/bin/setfont $FONT + /usr/bin/setfont "$FONT" fi # Load console keymap if [ "$KEYMAP" ]; then echo "keyboard: $KEYMAP" - /usr/bin/loadkeys -q $KEYMAP + /usr/bin/loadkeys -q "$KEYMAP" fi # Screen blanks after 15 minutes idle time diff --git a/rc/rc.fix b/rc/rc.fix index cf0dafbe..a23b0935 100755 --- a/rc/rc.fix +++ b/rc/rc.fix @@ -3,22 +3,20 @@ # /etc/rc.fix: adjustements startup file (multi-user) # - ####################################################################### # X11 font-related checks ####################################################################### if [ -d /usr/share/fonts/X11 ]; then - for i in `/bin/ls -d /usr/share/fonts/X11/*`; do - if [ ! -f $i/fonts.dir ]; then - mkfontdir $i &> /dev/null - mkfontscale $i &> /dev/null - fi - done + for i in `/bin/ls -d /usr/share/fonts/X11/*`; do + if [ ! -f $i/fonts.dir ]; then + mkfontdir $i &> /dev/null + mkfontscale $i &> /dev/null + fi + done fi if [ -d /var/cache/fontconfig ] && [ -z "`/bin/ls /var/cache/fontconfig/`" ]; then - fc-cache --system-only &> /dev/null + fc-cache --system-only &> /dev/null fi - # End of file diff --git a/rc/rc.multi b/rc/rc.multi index 465332fe..966f833b 100755 --- a/rc/rc.multi +++ b/rc/rc.multi @@ -8,7 +8,7 @@ # Run fixes startup file if [ -x /etc/rc.fix ]; then - /etc/rc.fix + /etc/rc.fix fi # Start services @@ -20,8 +20,8 @@ if [ "$SYSLOG" -o "${SERVICES[*]}" ]; then fi for service in ${SERVICES[@]}; do echo -n " $service" - /etc/rc.d/$service start &> /tmp/rc.$$ || echo -n "[ERROR]" - /usr/bin/logger -t $service -f /tmp/rc.$$ + /etc/rc.d/"$service" start &> /tmp/rc.$$ || echo -n "[ERROR]" + /usr/bin/logger -t "$service" -f /tmp/rc.$$ /bin/rm -f /tmp/rc.$$ done echo