[lxc-devel] [PATCH 2/2] oracle: Fix /dev/shm

Serge Hallyn serge.hallyn at ubuntu.com
Thu Jan 29 22:46:37 UTC 2015 

Quoting Stéphane Graber (stgraber at ubuntu.com):
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

though do drop the .swp please :)

> ---
>  templates/.lxc-ubuntu.in.swp | Bin 0 -> 16384 bytes
>  templates/lxc-oracle.in      |   8 ++++----
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  create mode 100644 templates/.lxc-ubuntu.in.swp
> 
> diff --git a/templates/.lxc-ubuntu.in.swp b/templates/.lxc-ubuntu.in.swp
> new file mode 100644
> index 0000000000000000000000000000000000000000..20fcc390292a4bbc7b45c5d905f0ce6a6d0a7e9d
> GIT binary patch
> literal 16384
> zcmeI3TWlQF8OMj-xD{H_hr&bAm-RMlC!W1Hi9vQY#27nqWyi_dCb0-OvomLR2hYw-
> z=Hj(U(n?idP#-|Os1H?9OX&q at RUSZ4T7g8RR;3b!6eOsGRH>D!_NA&oRN~tIcjmI2
> zwH at H0s;bUPKkx3je&;*qeCIpgj_c)HXXfaJ;$8)>Pb<pLzVqxN9sa8F+s`VBA2dC!
> zE<Db<*h|;^z|?H*Vr4k*i%EkeLkqN$?iiwEt?QCNv|URJgwNm9upZh$STybTYck8v
> zG>~cF18d+aWzR^Z%*6+CJLoglEPddbS;0&LnFcZqWE#jckZB;(K&F9A1DOW?_cai>
> zmnvVvFg_9wr4zqj()a#e{7UlI`|{t7^ZhveAAR}n#Q9&2)9Y~uNk4DL`FfoHm%jYB
> z`r1Df3!K#dXk5>Y-=FNukCU^vOaqw)G7V%J$TW~?Ak#pmflLFL1~Ls~8pt&8f2je@
> zi0=Mx@<kfI|0nnR*FU8wuYrGp$H8O31{PQaD!3B- at oGhR8GH*YgX_Q_u2Piq;2tms
> zE(0%pQc+$6_ktPluPYVh4e%Uz5_}sR2UmcnuTYdnz=Plc at O{t$hrl$r2^;{|gV!&I
> zoZvk81$Y8H4jusagKvPZfDo8q8Jqwrc=s}t2R`t?F)#y0Km`=QHQ;J+6?o%PMR@`I
> z2K)*<4DJR#xE-7XJHWf2P?W!c7r-yU55V`pcYzK@!CN0!lsCaoz&Ah>oB}K0Ch*?J
> z6y?|8Y48-d3ycB<JcD4z&%xc`82AF10V?<_;vSEIhr#{eKHvfe+zjMA%au;?tGz~f
> z&vAl=UlM^{GHo*``F^XYJ9cCHoT6d+THO+clC<NsNxiTFTH%&fT8<yA>{=BYyOgxF
> z-fBAr?OsoN2z{^Q*G;?RI+m$#sGeRll&Se?MXZ|vRmv4*U`L7b{Z_XTEuaGzZGrah
> zCvJp=G#hjqsofseG_Pct^^)PPHZkmmQ*vBkLtxbx-kR`=F61_CKcL&kDQF2>wlY9X
> zVG9qBs*o)@w6JiPFfxR_xQm7<-}s~6Vx=a+QRw2C7ol2?u33U+CypGd=J_w3JxhTX
> zitXw}6;$*|o68H!-?riw9SVD8X`#5ZIIZ6JA-dhJR;13mC at 1C0(e2!(&|6L-C^bFd
> zk~&4|Y0BL(Ie4;I+&#1_pSwVrZEaPMA9{j1f?C>|U`>-AdY-TYiq&O^hG`3fOgqYT
> z>_9^T9!z3Q_b6R<pUa1sz_Glm`F_Xoj2xZqpAEewGrNnof40zoW*DTZx+i$vT25P#
> z>XTf7b<J;)>_qn8RRor&!6l)Lc#!=9Zr&tvzXid at nSH~f=j5i7buca(z-UdMl1HO@
> z(mm03psG8ax=#(qBkWb*v4l_iNV5$ZCEv7lsZz(bHYged?d_K1C#$#%e)-U>YEsTG
> zRZr%G=bg-zs^wBHS-R3Hgoaov at t=MP{m^wi;rp1XCRt)lSmcC(8wOG?uAy)rQb#-b
> z4TKy!WRGT3HAEovATm6u0(ti~8s(9(u at N%eQB|`n4?PIakCQ7&vW at 4-WMX-2tSl4T
> z{A3!$YnbawLzL5WxvXpvC}U$4mQEIyiEOIkZ;o5n^i^em7O@~3j%7I=)5aLF at O;v+
> zV9}e2=i{)Qc?xEZu8oqexiW#9fk~*0+)ykRD at E=k&uO;S7I7-lk(zd@;0vk;FjyFI
> zk5yxv95u%!1~6LzwV}ASW>J*R8tS(Ge(gvRx=rzJOC^)`)@*24IwEL6htLrjE!|bL
> zFmPlVPEna}IZ>|V#Cnn?EGO1ik_;OeU=OaMFs6)a;?X0yMq5sY(59vb<{BGQ2+}Un
> zG&I?Epj@`cURw)H#~#L*IU#PqAKW)ol-*!&G)$-;6QO%%9n-?2+0-LuYfUpPIWdk+
> z8&2qvzu{wBDHl^#+zw8Lq+?lpfHzUYY_iGf?JmTYYswU<Fj+RSK-K&{`JL at jHNRJW
> z_Jk!gUsUsZ<kw^ls`-&9Tb{_(d__5<q#dqA&qWRnDN1bgiX^uu45SuX0Y5v5`Qc;E
> z+mz9 at NwX&=R~Dz{j?PXjPOVJNADNyxRLvbkYLXbG9n2}S^OF;^3yUas%S?^S^nORa
> z!mClmoQieV at d7$Jv3R(e=f7j6<Uo%;!8DG^^L>m>D5h^NHT<l_&=0Ymc{lKkNBaxb
> zo?B8B!?B}duGi8_uRyAb at QMuovJ+BU+n|nyvjdAO at HXU(oXi<c$F>~JIGIb$DOMEL
> zfMyhPR5`FS(t5Y4#a_#cjcFGGs<WIhmb~3V+x5&ftiC1^QWNI)HYO(`m)E>zj;fSX
> z)wbrk!capKN0RE`;M|ne<gCQ>u`st?P>K)Poja+HGig;}DbN6hfieeisv5lcZjm;W
> z<%EcafS_1&Q0QQ2v#G`;2?NV#fUwn2Al_gzwq6{jeHEJaG<y{$jurw>h+vqe%|_6o
> zY3yfjm~Ms%<NY`{K~x^8RLW{)PZ?%xX<>p}oHcd$Pl7bd!B*&)s3;FGI9Z<NZH)6N
> zU^{5E<C(nUF+rI6X>>#jP9x~RsB$wri+;-qEhBOWJfRD74Qke)Xm^90hOBq!$P&%s
> z<iQvZNsr8;qhTGsqa59qIjMxKJ85Qc<iIreY)@!zsy2Ce;>hB}%`>wzi_3&E(=&@l
> zrWO`xdcH;zSdF#CnaQQui5eYUsvVtQm?{!2Kzbeq#NkHjIQfpxEFPX;TBM01%XECA
> zRzsW1<5C|uxCm!t<i?nI;@QNoFm7l);DK=qa^=M;BbYci+5xN^j=a<XYQa%Or#LO(
> z8h1>~ikD_1w1(yA;l29UM>K*%CRSHGIm0}xLDZCH&~bUY4Z$F95I=qGQCw3hB%M#6
> zT-L1Lf(Z3!OI<K)J!@&41m+#C8AbvR-)wBKjL}kLHKC8TpUAZR6mFr12Cox8UMJ%$
> zKW|I&L{~xF75tx)gYF@~L>ROjZ;XzcR!dlIniD2QxE~7Ruf;ZhJ=kcet5(qv2T)-W
> z%gZyHt$?0+kVeXt@`Y8mC{e-udrd)y;g)RJv>&UnDT*!m?I6T+Y!ePYT$=U)Obi;3
> zv&+Yo8?f1c*Jkp?02U8^n^+HoZA8Zyu04GFfWxt_Q)Krks^`mw60a~$ltwAOnQ*PR
> zMrxU4K1 at 97CKoAoV->#tpT)iL1n!)C|4)8DKaacpkHI-m1G|9&UcvqT5pV`9fxTci
> z*a<!lt^^8r2Y3Fr!JoiW-~rGA%b*74!4bgmffCpOt_Pn3e at A@aG4K%h5%?iE0j>eB
> zB0g{){2p-Z;G5tSSOPV03|tHTjM%`-;3e=P;P}BBxC4xW-Cz(Dz-8bS!~>oKzXQ*L
> zCjrM0R>3iF9e4#Xfak%Z;HTgr at E|w`nqUl+z%bYiUPCP4Rd65pI=C0y1D3%gxE5Rm
> zt^k(<ju$)+9tB?mYv43k2DgGGFb5_<0bBy!#=JcN+Tc#WF$A8=;~;xw8pt&8-_bzi
> zkmi)=ePAG$c<gZkEx}RZ1F_(ThEu><&~Eb)0H??c;U8%JD$WF-WDu!8?orGsT~9T-
> zpvE@<>F%-DP>}J7Lga-d_YkBe9}7DmTM|A>WSYet9(|!(_8KXl#xvqe1$&xlTI#2E
> zhZudrwIFuX5w+1Q^DeOxHOGIuo%UrW?aGlE&Pwt<2}5+Hxu`G-2kll|&(S$35eGK$
> z9^JMm4_B(a(mfTS4}Dc at 3S8D>nWJ!HkA53)5ZOzUJ}YX<yPx!%iEp2|NSyplq}qbY
> zsaDuk<&Juaqcga~sZ4wmC)@#aPK)GwUn#IWk~ZPs%m0!~E6XFEedIWvvb|*S{WZQ$
> z_DhuNDw?%q#e5Li_(}!er(d$|B#Db}k|UL%VTFE6*YuW1d+)geMp5gkRBI{v63tt(
> zu6dIrg$A|GDyh>|DwOVkOI3{0saiTixXIzZm>;2Y1<FV29g+><z7oYSPg9|%Qd){e
> z4wN`BW``Ja9PyL4K9$3wQ4ihw+yLKylG&H;olo$T#jy0^vFTXTk&`d)PO2J at DH5rg
> ziv}8f%fXk7;$`s&Qw42Wz`ZVKe6PYymaPo>EN~x%c!F~IK at +jSa41JRaAPfZW#4vp
> z6nIS+Ai9Uu%ohmQ9#5POP59+;t5O+Utf#q7%fzxbL>;~3dZW42qsfs2J1ZPaJ`-Q-
> z3q9q!mJ%JcO`oGKIl}#YoEjSDeVop1uZidyA4fx at otN$w!gWbT(Rf293znlYa)Uw}
> zuG0~otK;gf#k-bul%^)P_H8xwp*v4H*1Y!U-uUW&TUSOoMM+)~Zr;v_eTdGnXV8o6
> zoCk;=T8+LzBTZPF)1;KW+aT2^$3K#W at cTfoT9dXmC#Qox`5&55bI*;VJ)>Y5+eYso
> zlDTAMRJn9y>p5_PHNt~3N4be~?vn~VMyh8!vN?*5$SKd`i>d9%J<mT<5Pt4Jw5q{D
> z8EMG72W?`CFf09s47ccZjOwW-_8x4QwADuUs62J?voaP_2JzP8a}0YeY$B$2nkwCK
> zr4cycYr2$&d)_s~f4eUkm!k1;g_BhE!d$<FND@`Xqv%z)lrQjOj~Q&JZIhKUL<>`s
> zOEtt_R_11EwfPzXqT>h$apjS;>7;Db_x1&ivnqa7z<?rI<i{#xNQ8++T|hC!uMr6l
> z8z{*iSMYJGt~D--*^dV&SH>0+)=@0+U{EyqxK)d4;(|m?Cf~Ly>Y>&6Y~;f6$E`|E
> Tqoh1MRe5?2QTHUhaQy!UtKDyf
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
> index c35ac40..5a6c3de 100644
> --- a/templates/lxc-oracle.in
> +++ b/templates/lxc-oracle.in
> @@ -297,13 +297,13 @@ EOF
>      if [ $container_release_major = "4" -o $container_release_major = "5" ]; then
>          grep -q "mount -t tmpfs tmpfs /dev/shm" $container_rootfs/etc/rc.sysinit
>          if [ $? -eq 1 ]; then
> -            echo "mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.sysinit
> -            echo "mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.d/rc.sysinit
> +            echo "mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.sysinit
> +            echo "mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm" >>$container_rootfs/etc/rc.d/rc.sysinit
>          fi
>      fi
>      if [ $container_release_major = "6" ]; then
> -        sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.sysinit
> -        sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.d/rc.sysinit
> +        sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.sysinit
> +        sed -i 's|mount -n -o remount /dev/shm >/dev/null 2>&1$|mkdir -p /dev/shm && mount -t tmpfs tmpfs /dev/shm # LXC|' $container_rootfs/etc/rc.d/rc.sysinit
>      fi
>  
>      # there might be other services that are useless but the below set is a good start
> -- 
> 1.9.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

More information about the lxc-devel mailing list