commit 613d478

chld  ·  2025-12-22 18:26:56 +0000 UTC
parent 6b28db5
setup-rootfs + util/lib.sh
2 files changed,  +5, -4
+2, -2
 1@@ -1,4 +1,4 @@
 2-#!/bin/sh -e
 3+#!/bin/sh
 4 
 5 . ./util/lib.sh
 6 
 7@@ -52,5 +52,5 @@ for i in reboot poweroff halt; do _swt toybox $i ; done
 8 for i in dmesg sysctl top lsmod; do _swt toybox $i ; done
 9 for i in getty login tty; do _swt toybox $i ; done
10 for i in free du df; do _swt toybox $i ; done
11-for i in kill killall killall15 pkill; do _swt toybox $i ; done
12+for i in kill killall killall5 pkill; do _swt toybox $i ; done
13 for i in time date; do _swt toybox $i ; done
+3, -2
 1@@ -10,8 +10,9 @@ _inc(){
 2 }
 3 _swt(){
 4 	# idiot proofing: do not link if command doesnt exist
 5-	if ! test -e $m/bin/$1; then exit 1 ; fi
 6-	if ! test -e $m/usr/bin/$2; then exit 1 ; fi
 7+	# 	-instead, return (avoiding link, and error)
 8+	if ! test -e $m/bin/$1; then return 0 ; fi
 9+	if ! test -e $m/usr/bin/$2; then return 0 ; fi
10 
11 	$m/bin/ln -sf $m/bin/$1 $m/usr/bin/$2
12 	$m/bin/ln -sf $m/bin/$1 $m/sbin/$2   # link both ways