From c103ece8b1cd48906c189d217991a84059fd63ab Mon Sep 17 00:00:00 2001 From: Nathan Fisher Date: Mon, 3 Oct 2022 09:37:41 -0400 Subject: [PATCH] Fix some service definitions based on a running system --- world/s6-scripts/etc/s6/rc/compiled/db | Bin 7063 -> 6971 bytes world/s6-scripts/etc/s6/rc/compiled/n | Bin 24 -> 24 bytes .../s6-scripts/etc/s6/rc/compiled/resolve.cdb | Bin 4043 -> 3972 bytes .../s6/rc/compiled/servicedirs/getty-tty1/run | 2 +- .../s6/rc/compiled/servicedirs/getty-tty2/run | 2 +- .../s6/rc/compiled/servicedirs/getty-tty3/run | 2 +- .../s6/rc/compiled/servicedirs/getty-tty4/run | 2 +- .../s6/rc/compiled/servicedirs/getty-tty5/run | 4 ++-- .../s6/rc/compiled/servicedirs/getty-tty6/run | 4 ++-- world/s6-scripts/etc/s6/sv/getty-tty1/run | 2 +- world/s6-scripts/etc/s6/sv/getty-tty2/run | 2 +- world/s6-scripts/etc/s6/sv/getty-tty3/run | 2 +- world/s6-scripts/etc/s6/sv/getty-tty4/run | 2 +- world/s6-scripts/etc/s6/sv/getty-tty5/run | 4 ++-- world/s6-scripts/etc/s6/sv/getty-tty6/run | 4 ++-- world/s6-scripts/etc/s6/sv/misc/contents | 1 - .../s6-scripts/etc/s6/sv/mount-filesystems/up | 2 +- world/s6-scripts/etc/s6/sv/mount-net/up | 2 +- world/s6-scripts/etc/s6/sv/setup/contents | 1 - .../s6-scripts/etc/s6/sv/sysuser/timeout-down | 1 - 20 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 world/s6-scripts/etc/s6/sv/sysuser/timeout-down diff --git a/world/s6-scripts/etc/s6/rc/compiled/db b/world/s6-scripts/etc/s6/rc/compiled/db index 7b7af86e8222163fc66d76368e6d8d6c7a7e5ec5..2ecca2540866456183f08ee5fc2116a17904c354 100644 GIT binary patch delta 739 zcmZXSJxjx25XX~R-x6b!Hc4x>w53&xv>3HiP!OCH9L2>&&~|M=tGoCC91c-8^$VyJ z3gY0)AWj8$KY$Jjf|Et@e@}vl9^C)(-0!)&=Si|Zd09HUQZ!deRo#_prB<$NNpv3U zqbFsi%ay!L-BFVr^@`yH=rB^0lhlk%$|+LJ-R`vHS(;AFjGU%BGf6LIR*q5FDnjS1 zyd0+*w4aWJHifo?=Ip%Pj|S~<#qT72NmBToX6*>MR@X>}k7UM-;QuU$%mAI*d3k^y zZHJDmAnDNpRx?ot>IyxACg=g0p+JmvLTFj&p3u9P6CXmiq&GupA?i5X0mdpV()*(E z98&(Z)dZe#c(ol^P0*~5GhVgYK(s(c7&k=qC{kGuYm12EAh*EUBI$N?ficgAX`7Hv z#AU|3_-p*yxL_ELqTUNHYTGCXz5VpdBi(~*xQMt*=mS{4!Q!`ZuK=9;6+ECnBOQ=f5O;c!x6#7zsx^yXy z20Vj;;3BwM=@`&WSHZ!dn}XfC2yTu2zMG_w1Lr&Ep7Y)FbKmP!URRI4*s+$%HFuhu zVbI*EZ*7KhG?9@%_Cvd+7-Z;p&Y2nW!sp>$*w|H#XN|h*AHw5hT^_Lt^3<(bIr->T zBQr{=yqvo2YXx|ef*d4f^Mey39sx42^s~}Q%votUO)LVlUSMTp8JLwP2HzX}Zt&a- zl3Cn|Ky6;8bd_>rQuch48bgFBYmiDyKIKM6ah#IFWMECnr(_BE%b@GiUoyA{oR$y3 zqWm;Co}z!>;I_fHsnXORFXnV$@j}i5FLYRQnl($%VviDCgT0IFH&CK$q)5#hoh0Q}pRx~&>e0uf?3*fl zHd43%XxBgYZ1e>vv42BV0;DFeS_>BY#r}g5|0*wi-!z#=n3*#Gs>XjXeRer&1>ptg z6{R#shmHRQMc=q=LP{A5(KP_Rn@*Eb8>)gODS8!vO8OBgt3#AU!%(^ni&=D?l=cvX p%^>;&z((&#IeC@wi_F|(jz1CLCKA89c39c1&u^?h$TgZ9_63hXgR=kt diff --git a/world/s6-scripts/etc/s6/rc/compiled/n b/world/s6-scripts/etc/s6/rc/compiled/n index a4b0ca2b2dede4fe9610ff1c099709ba27bdbae7..bc4fb643b168033ac8dfa8f16ddac20e01984fe6 100644 GIT binary patch literal 24 ccmZQzV31&7VBlh45awWDU`hnC&4HK^00_MR*#H0l literal 24 ccmZQzV31^BVBlh45LRYjU`hqDErFO30196K`v3p{ diff --git a/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb b/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb index b508ebc609614dcee54924427b15867a73f469c9..ce72e61a480b5b81fdb13da964506e3d4c1cbe92 100644 GIT binary patch literal 3972 zcmds3O=w(I6t3wsX(r82%`{D#q%oR}i_yf6kwS6NKix<-0mV}6^u0ToA@66HcgHw1 zrGmP!D~nM?T)2p|h$~TOX>Fxc3RQ&u3080wTv)+H5|E?aOMoO(!mM(qD5WM8|buX~BiJ0^LT zL;AV!BWm$q&B#7pmp<+W=|3(0cZ2kw5&!=Z6Nr0J;@(SSKi4HMk@~FY%OU;d#cw6Z zeTg=FRtd7+6zU}oN!|AYnLmU4yeDH)2a&uhsD&reZ(8^n;cblXoA4JcWW4L56RFRN zZX@}5;p-voiFSPMfV8K?ZX@|2;a3x~?u^vE5{%DN_KhurjPHt_NL`D*9MZ1|!aQYH zy_|J@{2JuRk6f$lcBs&ugw zIx)YwS>jfCgn{0*aS0jsTZy#t8EMnf1ZXx6l;WQ@HdhVgjF-Z4k^Y@#n11M%F*r~U zn)nmo(vi;Uf|CwHH#TlG{`pA<-A};3!we)JMmos)3S4^!KFp`GC9jemS6WxnZa5i$ zYFj5Z*H_Uvez%(9oG^$&PyKy(8%#3CQ`sOs&lWS%Lxmvca~w%CBVGs8TjKFHFD1Q@ zdDbWKVNum`P|_%rrW*E1u#Gir2JE^Tb{p744f_PxwKePr*ap*UG>ZF^bMv9+suBzj zbTSeoHiUtS@*(bAIS69&8V-$vj=PlK&GhHhA!#_^Af0zW%q!rlSqq^*Z5$$J%My8E z7=wlJ8TCN6K>8tD>D&j2uMLnzrXZUjU69R?Zb%;^)8H2(2f&xiE5NJN3mIS_I>w_1 z)~$#oy#jGnE?f3^xOLsYa}qq_dJWjQ?^Lg8lC`nFxLM!;WRShEj6>B2e_v`q`gk=q z?fmEqblEhlr;`^>k_5v1^vy z@Vky)+LN~U-7j73c^mqHPrhmX(%SDV=FS|nbhE#(@6;n_t^J1Adr#jQ2d|&`_4A{^ z*M@H=7kGNI-dM~%^_`_3`|z?Fvh?Hcg;Ud3|0iZ{4))i{f3h{7oUr^(9he(CjyR{g zzgF!;=!dPiCcnWmu%EE(XQ6Mm^mEV^^m9M%OnzqNG5gQMzR&W%@XmDGTd4Cw!^xJ1 zE&s0`TlnGUI`v;V?7g}N^SONUg^^4h`?p7a`rvyj&eb=s?L7j&8}9x`;}>BH5&Y#! uwCg$8=XMmQ4)U4HntQkZMrWOK`pwzzUV;DZF1>Kevj6#h?~8v}_520PYk`6Q literal 4043 zcmds1TWDNW6s>8S*EEkdX_|DBHi=&nMiXmOB;rS(LIi*OC>@GU?!A*4=RStHcZ_2q z3O>LVMMXu7AA(g2DF}ktI$EJ1g;snt^rr#8q#zOf2!&EKy4Ib2GW zM7J8`x=~rT7LfHOWiC0X`*tAfn8g0PC(}{~k^GEcS$HCKbHdLHuVZ-MS|Gv`(~$Y% z;uGl)h_5605#ghd@llCKA>&Dj>qtH){8~cRJt=js2E+4|b<-;#^Up|}NWU!pN=RKD zjQbQ#>&cYq;H{rGf>hw-(^=c{6TTG`^C0>*EstOks9u%CFZo5^DuCKqD^gHKV8hwL zlr(=L#biAyS;2C=q8lU%o)>`ct`}XwNZ6i{;@WsjaVgjI928`kV79AGTq}SUOqUW? zQeyM854uzBRiX0*&j|T#4U)IQBMtnH%}dB|1SLPP9A?_ObOZDsCTi!uI-9E`GR6yD zF;9J)8ja(bMa&Y^7L`8-F5w5MAZsLC&kTc`l|D0Jp!*#3t!f|{&kx*`V}WaF#Sizh zQU$w|7`K9;lrX&s7gX~`iJ6Y&kK?^b6=!&^@7dNr=ebF3X4qEB4UagcMmm;t(+=+Vu!%i zs9ybH+@G|W@oY1^kax5(6D$mPuH|Pu+_|FbhT(M_8V4PADen!`^XiaP9I&6_{V?@m z@IzV;qntQ4<~mFtR$9_X5nc(y5}&gN~Ge=TvyyQOzvh|KI9XO|w4s zsW;yXzYo^W-dNID<&WUD*Mm~Rr?zhIhd-eEy1`(ohsU|>X|W#qG@O#~t@oFvp1{=F z7l)0nI6Zmp`D1ACb52s82MfE7UDe`>-}mhK0||}a|JbFjkKi9Y^=-qfw%%AwmwnAw z>$8uXzVmzNog=@!azM+Y;tGRl zqxrAD<4t{{=|4VkrEf5zo|8?P#+NkR>7xseo6ofoZsBK%jiylOv%WyHVG;$Oml zSo6=qe+vHDpY}G+YWt}5Un4%I>Ce6OX7dNA^IXlz*ltb#&E41L{*0*q{G|QdVa(^k zmBT}aBI4gYbM?LJTAoWU&mMdYy31zruC@sMuRr?x9tXehKz`~t{~F|3c)RCvTf})? YHY1R7r8|Lho_5c6? diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run index ea05427..90794cc 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty1/conf importas -iu SPAWN SPAWN -exec getty tty1 +exec getty /dev/tty1 diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run index 9440f9e..4225e0d 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty2/conf importas -iu SPAWN SPAWN -exec getty tty2 +exec getty /dev/tty2 diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run index 5e3e34d..df6ae6a 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty3/conf importas -iu SPAWN SPAWN -exec getty tty3 +exec getty /dev/tty3 diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run index bbf7528..bbee62b 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty4/conf importas -iu SPAWN SPAWN -exec getty tty4 +exec getty /dev/tty4 diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run index b0e6162..2a3ccc8 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } -envfile /etc/s6/sv/agetty-tty5/conf +envfile /etc/s6/sv/getty-tty5/conf importas -iu SPAWN SPAWN -exec getty tty5 +exec getty /dev/tty5 diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run index c39498c..6a84480 100755 --- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run +++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } -envfile /etc/s6/sv/agetty-tty6/conf +envfile /etc/s6/sv/getty-tty6/conf importas -iu SPAWN SPAWN -exec getty tty6 +exec getty /dev/tty6 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty1/run b/world/s6-scripts/etc/s6/sv/getty-tty1/run index ea05427..90794cc 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty1/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty1/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty1/conf importas -iu SPAWN SPAWN -exec getty tty1 +exec getty /dev/tty1 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty2/run b/world/s6-scripts/etc/s6/sv/getty-tty2/run index 9440f9e..4225e0d 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty2/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty2/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty2/conf importas -iu SPAWN SPAWN -exec getty tty2 +exec getty /dev/tty2 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty3/run b/world/s6-scripts/etc/s6/sv/getty-tty3/run index 5e3e34d..df6ae6a 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty3/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty3/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty3/conf importas -iu SPAWN SPAWN -exec getty tty3 +exec getty /dev/tty3 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty4/run b/world/s6-scripts/etc/s6/sv/getty-tty4/run index bbf7528..bbee62b 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty4/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty4/run @@ -2,4 +2,4 @@ if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } envfile /etc/s6/sv/getty-tty4/conf importas -iu SPAWN SPAWN -exec getty tty4 +exec getty /dev/tty4 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty5/run b/world/s6-scripts/etc/s6/sv/getty-tty5/run index b0e6162..2a3ccc8 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty5/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty5/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } -envfile /etc/s6/sv/agetty-tty5/conf +envfile /etc/s6/sv/getty-tty5/conf importas -iu SPAWN SPAWN -exec getty tty5 +exec getty /dev/tty5 diff --git a/world/s6-scripts/etc/s6/sv/getty-tty6/run b/world/s6-scripts/etc/s6/sv/getty-tty6/run index c39498c..6a84480 100644 --- a/world/s6-scripts/etc/s6/sv/getty-tty6/run +++ b/world/s6-scripts/etc/s6/sv/getty-tty6/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems } -envfile /etc/s6/sv/agetty-tty6/conf +envfile /etc/s6/sv/getty-tty6/conf importas -iu SPAWN SPAWN -exec getty tty6 +exec getty /dev/tty6 diff --git a/world/s6-scripts/etc/s6/sv/misc/contents b/world/s6-scripts/etc/s6/sv/misc/contents index f537c20..795f013 100644 --- a/world/s6-scripts/etc/s6/sv/misc/contents +++ b/world/s6-scripts/etc/s6/sv/misc/contents @@ -1,6 +1,5 @@ hostname hwclock -modules kmod-static-nodes tmpfiles-dev rc-local diff --git a/world/s6-scripts/etc/s6/sv/mount-filesystems/up b/world/s6-scripts/etc/s6/sv/mount-filesystems/up index 5e481a3..17691f1 100644 --- a/world/s6-scripts/etc/s6/sv/mount-filesystems/up +++ b/world/s6-scripts/etc/s6/sv/mount-filesystems/up @@ -1,3 +1,3 @@ #!/bin/execlineb -P -foreground { mount -a -t nonfs,nocifs } +foreground { mount -a -o no_netdev } foreground { if { test -x /usr/bin/zfs } zfs mount -a } diff --git a/world/s6-scripts/etc/s6/sv/mount-net/up b/world/s6-scripts/etc/s6/sv/mount-net/up index 3270c08..b132835 100644 --- a/world/s6-scripts/etc/s6/sv/mount-net/up +++ b/world/s6-scripts/etc/s6/sv/mount-net/up @@ -1,2 +1,2 @@ #!/bin/execlineb -P -exec mount -a -t nfs,cifs +exec mount -a -o netdev diff --git a/world/s6-scripts/etc/s6/sv/setup/contents b/world/s6-scripts/etc/s6/sv/setup/contents index d9c7230..58de758 100644 --- a/world/s6-scripts/etc/s6/sv/setup/contents +++ b/world/s6-scripts/etc/s6/sv/setup/contents @@ -4,7 +4,6 @@ getty net-lo swap random-seed -tmpfiles-setup dmesg sysctl binfmt diff --git a/world/s6-scripts/etc/s6/sv/sysuser/timeout-down b/world/s6-scripts/etc/s6/sv/sysuser/timeout-down deleted file mode 100644 index 573541a..0000000 --- a/world/s6-scripts/etc/s6/sv/sysuser/timeout-down +++ /dev/null @@ -1 +0,0 @@ -0