diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-08-27 17:20:42 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-08-27 17:20:42 +0200 |
| commit | 6d9f649c41db3e121cfaf94be1a07075773ef93f (patch) | |
| tree | 4aa4e25333d44fcab5794edf38ae2d73b849b30d | |
| parent | e3506f4c4d64903e9394f3dc55d9fe74af2af46c (diff) | |
| download | plan9front-6d9f649c41db3e121cfaf94be1a07075773ef93f.tar.xz | |
bootrc: broke #ec copying, fix it. dontkill: ignore errors
| -rwxr-xr-x | rc/bin/dontkill | 3 | ||||
| -rw-r--r-- | sys/src/9/boot/bootrc | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/rc/bin/dontkill b/rc/bin/dontkill index a471aadb8..3dc79b940 100755 --- a/rc/bin/dontkill +++ b/rc/bin/dontkill @@ -7,4 +7,5 @@ if (! ~ $#* 1) { } # see /sys/src/9/port/proc.c:/^killbig pids=`{psu | awk '$NF ~ /'$1'/ {print $2}'} -~ $#pids 0 || for(p in /proc/^$pids^/ctl){chmod +w $p; echo noswap >$p; chmod -w $p} +~ $#pids 0 || {for(p in /proc/^$pids^/ctl){chmod +w $p; echo noswap >$p; chmod -w $p}} >/dev/null >[2=1] + diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc index 881c3d54b..339b1bdbd 100644 --- a/sys/src/9/boot/bootrc +++ b/sys/src/9/boot/bootrc @@ -17,11 +17,8 @@ cat '#r/rtc' >/dev/time >[2]/dev/null # reparse #ec variables, move to #e for(i in `{ls -p '#ec'}){ - a=`{echo $$i} - $i=() - rm -f /env/$i - if(! ~ $#a 0) - $i=$a + cat '#ec/'^$i >'#e/'^$i + $i=`{echo $$i} } fn fatal { |