From 7436979bb1f6169b25e372fec654c3b3332570e8 Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Tue, 2 Jan 2018 12:25:18 +0100 Subject: [PATCH] Remove tasksel only if no X session was installed (see #17). --- CHANGELOG.md | 2 +- scripts/latecommand.tar.gz | Bin 4079 -> 4136 bytes scripts/latecommand/post.sh | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90507f8..eb3d8e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Gnome preseed is now only available with UEFI (see #20). ### Fix -* Leave standard task in peace to be able to have a X session for user's nodes… (see #17). +* Remove tasksel only if no X session was installed (see #17). * Update doc about Debian distribution name and remove useless entries (oldStable). * No longer define zsh as default shell for root. * Installation of aptitude, puppet, tmux and zsh move to latecommand script (post.sh). diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz index 90005d90020bf5a63fb846b93688c85565841b63..73ac4d307cdb5754f4784f7991cec1e71d8835ca 100644 GIT binary patch delta 4006 zcmV;X4_WZ}yL}00ZqEYj4}gF<;GJv6T$eHZ1Ec;S!{P8^>28&Lyy& z9*VXIXmTa(nXmF;TjvYVU(+AfU(%W7Ye_CCB~}!tw{wRxwVc_Vea&lUd6phh!?kVQ zF}u&c67&G3<1zjnjHZ3@Zwk-)!$E&A9*(BH$+KR6I2w(ApONv`Vn~E22z8&3XTQ+7 z?wdNR!&~+KI|WOae?M3TmOJ10I#_T1`{VIwIvq^`uRrcjCTjk-0kZi|{vH{wGuuQP zIKh+AsBZoTLs%O)|HJWMIvq}7{-o8=f6!zmxe}R&Ix%1|7G*Y*F)wy zWX3E?X0A_vQX~zi-nu>|%zj$5ug&f<$E5d1-ooo@Z6riEh05%5 z1p%e$`)(BY-C&{nv}?KJ zi|$#jZoX_WJGu{Cte#nP^z;X@UBG7zDZTK;tGiP3|;|9v1 z1|rsRLw$!@DMebP)-I9Sx{r;El%3Ao-BP@}9)Q zLVRja5684pe`I>CeXY$LFADd|`LsBgkma46Xc(Q&x zfA{Bq<8yLycJcbv)!AQbr%j{-WX9>bMo_o!uAVY z0=yfP1fJ_!1e5@Qp@6<{2C)5~UH=B^qekfZOVYj7VP7I{x&`Cf&K$#vpe^Lz;Ibos zt^xLUQM{Na1a=ejSjvt7WI6pkQ=o&5sinv@jjO$6{|vPcQy#X*eNp> z3bnpTT4zp6nbtvL@GJ-^68@}tTV1uI| zF4`k&;C4A462t>9Bgy$la1b5MB6$j|%k$;90y5&nj5BLh#T*Bbqkz_b)SM%8 zoJ`@JCw3g}7F6h1Rbmyw++TVyr=sAcG(vFN}YwTedM!O=^TUPtp6|Il`- zG6GBaobexgN#N6tuwRiFor2@oJcUZ3N?d#|;IHF`%%J#$YpuQwloN-4$<|NHu(iXi z@g1Sf#Muer{=K%TKc|ktKtX|12ucTxbl5ZWmio(U*IaVP3KlAJ;to?J*a3L%+Tcst z!TkAwGXEqX+JBxKgh#<*<87>n|Ba`UQ7QgAhEiq!Z3EhW=w36Y8!R*}@n26qzIyl5 z>C4vcp2>Vi2f?!2+n2_F23tAF>Dl?~m#vD;CtxJbaZ}v|zoSYjX~QhjXn=U}?&|pJ zwX`Kb^j&mt^QVL`rxTi~M{4Lz-bTWugihLqDI++3e|2{C;bc{JbT4EfxYSb8n$~1A zC-2{^>Xqr;%qt`{O~kn1s+0G+af9-lJUl$0KzD*Djz28)TN;~x(br&N7+?m)h#Ig* zI!ln~ut7oZq}-Cwj_%2?xM17l0<;N`|8#oEeGcCsGWtzX5{Y#hXguAI+pluzeWD}0_`?O+i8=xNSTIr z?p)urSin^k45ZJ04BY{nYKA^k!WVWe>+()OEoy|Fguau}cRB&hieIKxfu^l?ROA{N zx}fO@f+aVLEE2yXrfcvq<3!iM0Wz7sV@6o4Je!5Uqm~8rBRw#5&2%UIWicnZhaa7g z-h-(d*VUOvA()bmhaE&r;kg5NzE18EZrAL6>*!$b^tai6J|{XlXlXO1l_rfkb0Dml zwdAEZZFR$#))Ti-TC+BDm<_hFDXt(*HfYf0j(MH+JYIO8K7EQGE-(KgS$9FOfL{Ax z-^hEBzh9>#LT%-~q)fUVbp$k7KZ+>%&spfDWJ1@-u@f+ix0)0X&DeUA*6S_9h3jcEW=uVNJiys#`}N;xL%Xzj;V(_w*}Gtavf{Q-yA@$L}{X_o>Ix z;rY&hG8n@S{TFEsR*xm}A@UFpXg;C ky}bL<9>k;c6Rb2occh+D*rc4olqLqV~A z%DE!M@CxryR>S)$3G!9K6_i$qL{LkgTJdf|vnb4e7{%!YD_@IUTqCq#NMejU4lMTl zJXHd+-sdlC`(ISYk^v~{`M5h}qI?LXin~ly9E37qK@pcp3#wK^oT=3^VWvFeVUNT1 zu+Cv+8w*^;W)^$LPy^SKnQuq-(lvTWaB(00_uv27*X$dhAsr9IX6`V$miZAqHz9hI zkRF+Tc^Tg!IffNdFaU5f33RFDRSW=;QgDY9qBleg&lJNC#c&p>_(~Wz7 zWB)Ji2p@Q`Vsq;kJNG8bs!Gay8#yl8Y5bT3kdGteIfO03jj1wG<)lw?DvSAKXtdVS zW+!dcgSt{tp@ICU4g&&Na+$o1{P?tNZB{MPCSQ)rVCJwe*Dk47r@XoE!kc?azJ<)W zQ1IkIlK+*OZyRf4-TZ%^|BZP4$q4;_Kb8Og^`T+@H+BtRRsR2|Uz-0xzXwIi|K9@q z?(_e5-@4|xtD7Xv{r{}Ye}Nja{>fT7{{j)_&8?s9zxxJ^t@kjXMBh z7fla-1KK6`5H2EzjQgWC68?ocLIdkK!(4yBEmzc(s^9*y6#wri$DhEj5OY#QBhNxd z15B;V6yLp|9@=W=+hBe{&4@QbU~tvd083pB_(ss6|2K9GVCDV4>8PUr2Ysdgw*e~u z|MQ!cC9M}CPSi^NlX40w0zqz*o(f=pYuWo0K-B-01H28jv3~q#*z1pa82_2})%PE^ z0*&*ZsPD(NvC96NOee+pAM}RfiL(E;0fpno_!y_)X_7rWbVGv<&w8NP!|=n*ckT2% zXu?_mPL3cLj$p)R+p#N&kobvt5atc|YOg2z|vJsLE zjciP0gCQFQS@&iAmUTGm>4QenMK*;;*iF_F{_;47Gk0&`85Q@8+Fpn+Krneeh$6(L zmcA5zW3F0Um4=o9b8g)m+VPDelVoR^aZ7(9U6bB+oyf8Pl{#j8=TiG5tlOe7Sz|cL zO#IpxiR~}7my6c?L1__G?C=$TR!@T~(O~@4*yq(7zyh_HY z^|osDTwZ=Bx_WoFdOlvdX8vI4=}wAOaynv)4wcCQ^PL#xI9XGETlh^M;+dCvMW!Lb4SsHirk6^3a9yQp1j2ZmWdip_wG*$@n z#YaUr9I&eSw*T)zf=2nDCL}$wjTQ1AKlfPn|3+ga|F;5_`#?l6fhMBOBbYL^Tex~B2HIG)|3~9dDgHMdPu2O~R-kbAkLMIWh?_nU1pPs?Z&U9N#hM&u zKUU;CQ=w5#2)>+uaR2a0aQ3a|>T7^>|8MvU(Cfzk$D?r%{=x6RsPBJo3FPy?p}>Cv ztG@r(@ApgdKkZFa{C_LZ&eA_(-;-bV#?LC~_{=Quk?{*~hs3j}9#9@FkX(bToB=dP zvA?5;^-dPB-ihPYJGn~PDQk=D()W%K-P_q&Gq$%=ADpg#3B^9(C)9)xrN~<`-dJH3 zYuzZD!pX!V*ote}C}WLb>PN7OwQQ8pG*bQuo}h}2vh?U!{UiEaQ=;r$8-9v6`6uB0=fOSp@W|UR-XTiv;2?oWIW~hA4B#1@2$Z1cK(A! zw|F@f??pg=8v?CQg)<*=$AF3Xugv>qr$45P5eMNIhS$$#>4%_sAVP>qJpBWs)D|9s zmPrn4M0F!SwyCHcX|N|b9?I(#nv%89Tek&u7}N-I`M;rqp9EH(|BN#EKkD)C|4s+$ z`@h=(+4)bp_a?%2%!Hx19R=Z4HGs44%PHgV34?q*|8MBvCxMmcKg0C@|27;>`a{hB z9`@D$|7|NEJO8OD;r>7r07c`dP98|lSE}J2Xm!=0&lcGcTUTOBlerHn5Ky2%!PA5P M0W6|#1OT7_0PWonNdN!< delta 3949 zcmV-z50dbxAnzZ4ABzY8U$ZJ&00ZqEYj4}gF<;GJv9%1;HZ1Ec;S!{P8^_lm&Lyy& z9*VXIXmTa(i7)VBTjvYVU(+AfU(%W7Ye_CCC6<-fPJ)P9&g{;<=C!kmrH9mTZCiKD z&XY%iF2H0o!q5J2(i1;Zc+wm6d;L*=Jf2LRbbEs#pp(&mV=*K`6ok4@$dljbO!rNl z)#0sr|BZqr%)cKj1IwLld>yPe|Gm*@IGGG5fY%%K#$z@A+W^`8C!fcL>r6M%22SvJ zIINrh{s7hn&i`Q4pG*e0|0g5(Al*$gz6yTu`EL=@p`lTjb3$IgzibxyddOUdOqoT= z)b&YO0g*DbgynR*BTseQaE$Y`5Q>T)b|#iA{q*pHX7yo_@_N7A~RFIo|uzcO)Jb;!}fq zIHr~QBh%YG&|1v#qHsT4dNeI0$j=WCE?lrzE}@Qo4J&!hW^?Et zHCTYlE<+BE2uecggv50NDum>e4N~MEH&icyn08+gpdi=5yUJ z{{FM?Mjp{kJO28@r_lTx*Q5l*Y**VmWxiMjs#n{4Z|lK=fUxbyocubcu>C@p0PhAR zf#`TN=w_se`E61=RXbbr_xa^2)fc;&6 z6fY(UfxQGhmNI38LoS0VizQwl7qxqtk1j1&_R~*-T+_a^u>A@_rvD3rwt+TQ=>NfB zG%VSFlM$dR{l5hOg`3DR;zzh+i+Vm)$cLrenh55JWd2=kR>JBvakssv5^qkHY!! zA&~%=tGM+z3W`;H@O*Yt#V_D;6vRI~K757+M_H-kIu!BS89^ek4c~QEu)$Ff7wwTX za623i3F3j5k>q?NIEapBk-YvKo#P;~<@s`40U2>(#+kLMVvd8zQ9x^I&XGBPPNwkA z6FUxf3o3N1DzOS-?k_!|?s8yG(G!hkDc-A6NK zP6L|jf6gLqH!1J9>>wN~E-%88?7>!)RZ*xFIn_>RzK z;_L)*|6bbEpHatPprF7h1f>H;I_w#GL;dBoYc9EC1q+oqafc}q>;OD?twGK~g^7jLglu3k!8 z0z}_M2RDC82y;52nR=v#-sEj0TuSJqZJ08GlXq9IuHK)n>W=P(ECiQYN?OyJjOO&+ z>s7rny~V6TQqx3?3$8kOryC2D=j8tW9tFA+L~;CKuHVqujJ^hc6T<*AC`QzPJ{o&k&5)G}P4_hS@i8njW)fm4uTVFZDk zx<-T{pV)JVnM-O7^@T5*!lf5NTWDyMtZw?`LSYIoeK(yg|w|ymRaN zro{rTs$d{}X6O!o*i=*Wp%T8ZYgw0f0%}nsY$x>XjK19tXjc3@tqL@4wWA`}$j}8% zM-VKzX=IW39Wh;lj~OSr1`d$P^c^$8V&&N^1Rk|4s2}Npp=+i)={Jix(H(qghx86i z-MFsyEDFJtbUf@JVhYb~!1Hx-n{c~k?{|+6_s{;A9&n<6 zFY@>6bVR7F+?SL|*Q1VrChJELCI31Ny_8Jo8aZ(ShVfRD0-_mPZ_;|bWjJ@8HoW4Z zA{&{DB<_rVqr-!YF*?|b*{g!%ACFXf3WIfD&`clmAtJ=^3hz;1?Gq1s9QOu)!3J)EF=r@?v*0!Q>Ri!e&Jo#9 zm*Ww^-F5W8|NQqrvll=^+8)TA+~aaB^8>m*Lii;iJvQ?)zD08kE2N-7LtsOoOHG$z z1cj8MBcu@iAYy!@=)V`^L8Rh99fP7X=C*6%K|r?-ySdT4u4*@+a`)EZrxQR_qbD0N6uuH%hMD${0@Dhlio#*?&oco7I{Q&d}$nKg+ zPioG0CcR@J>3&a+WX1pc4W@$8jkGr_yqrN+#mLp|F;eJME@^Y9*^k; zrcG?o8%&$rf>T%;z%BTOX^Y!)5z`jGw5RBQMV^NT?i+O&ufU!LM@*MyYIHql36w?ngSeF%wF3H(v8)|G?t*jwQ~LiBFvjxKihwQ?==`(?{ti-0)f$4*uiX#I{;!AO%J{U+9mf8 zE+U7Fdc!pm{)IY11M7H&x&DA#uBa(hzx8=3{@+lJKY?!{=A=fRg^mW8TA3-ncR@Y0 z)yy}+?1GvRZ-l_$s;dE(x*G6>ph5p{>>9wz`+t*RMgRAEO8;*IRQ~^`H!VvCS}#PL zsFi$^uL>#xIdqfT3SfU}+50tssQ)VmcpGYC{rJzI+Z%Q<{xj*R-+$N&G|qpbz8~7g zD*JCd85ifj-yMv`%KqC16pkO`W1NDgN%ry34GlUx>w#hq!w*y6wbS#Y15J~Q@tWde z*(}2t6Y6U-B{x|A>tB~sU*=?-Q z|GnX`SJMBz(Rifv|2Ck-130@d|0J93T^yUulH_0)uF~T_)b;*2n$KxSC zXCM&}LpjV1riD~LSl6z85!rA_#i@X5XgXABr_O%zmuMd8R_6 zoDhF}IpO-`SHanro~y?I>HgpFFF>yw{~rxUUHF5)|1un^-~ZkU$mf4Uf&Te%oj6{-ldF`SvbM++6I8KLmL43de?VWbj*WKalaC7?z&zHx*_o(4 zvH1J}&VM50;hcVHMW*1hKyLqS=-?-TmFGXBEdOIP9!+@u$3Xr5_g3IrJO9C=8@zv< ziuWR*4T09D!kG`bWx&MjcjkSu(;w5th=Xtp!|P|$^oO8%AVP>qeEkPTsVzJJEt4G9 zi0VduY*SG?(qK<=Je1cfG$m`HyKW2WFsKpa@_$1IKMAZn{~2cTe+Zc9|M$D<{AVj5 zJO4@d-dNaq=}Xll>1Kk`NCJ`1;`g%2L;Z H0H6Q>hMUkX diff --git a/scripts/latecommand/post.sh b/scripts/latecommand/post.sh index 80c894c..6ec54da 100755 --- a/scripts/latecommand/post.sh +++ b/scripts/latecommand/post.sh @@ -57,6 +57,14 @@ aptitude -y install openssh-server openssh-sftp-server # Ansible dependencies aptitude -y install python-apt +### Tasksel {{{ +# If tasksel and tasksel-data are the only task* relative packages +if [ "$(dpkg -l | grep task | wc -l)" -eq "2" ]; then + aptitude -y remove tasksel tasksel-data +fi + +### }}} + ## }}} ### Rsyslog {{{