From a9c79ca99896310602243e3039e8fb5f5b93da61 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 4 Oct 2007 14:26:06 +0100 Subject: [PATCH] Import patches-unapplied version 0.40 to ubuntu/gutsy Imported using git-ubuntu import. Changelog parent: a9ffe6275ee079e2da27838afce7d4258f93ce39 New changelog entries: * Set CASPER_GENERATE_UUID=1 to tell casper's initramfs hook to generate a UUID which will be checked against the discovered medium (LP: #144800). --- .bzr/branch/revision-history | 5 +- .bzr/checkout/dirstate | Bin 3445 -> 3492 bytes .bzr/checkout/merge-hashes | 9 ++ .bzr/repository/inventory.kndx | 25 ++--- .bzr/repository/inventory.knit | Bin 63177 -> 64945 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx | 93 +++++++++--------- ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit | Bin 42620 -> 43430 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx | 92 ++++++++--------- ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit | Bin 62619 -> 63068 bytes .bzr/repository/revisions.kndx | 25 ++--- .bzr/repository/revisions.knit | Bin 47127 -> 48401 bytes debian/changelog | 7 ++ livecd.sh | 1 + 13 files changed, 144 insertions(+), 113 deletions(-) create mode 100644 .bzr/checkout/merge-hashes diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history index c5847f45..92547804 100644 --- a/.bzr/branch/revision-history +++ b/.bzr/branch/revision-history @@ -135,4 +135,7 @@ cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz lamont@mib-20070926194432-f8un38pb6snfs55t lamont@mib-20070926194801-xpo9hnwvqi53nblb doko@salsa-20071003155232-f4n9tdezdkcmn21z -doko@salsa-20071004092543-qzap04qfo6i77h29 \ No newline at end of file +doko@salsa-20071004092543-qzap04qfo6i77h29 +doko@salsa-20071004110523-ab0qzrldakrxi9ap +cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf +cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 \ No newline at end of file diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate index 55d824e270886f6d847a2340d745869fe4eb0805..c3cd45b1971b552e9d40343d383489d093660587 100644 GIT binary patch delta 841 zcmbV~y>1gh6otnSP;f+tDT0ua3JGL1KfALtQ3}S&Cbm!#j6%RPX#O_XYp>U_*Vr_v z=@QK=&`{?AcmzsBLq|tT5olNxu#{+vg!<@wI_IAIWAXi+!+TB4a6owg%SqOIWs}i< z+YVQj5Gf;|J8$G@*iRm5ne>ykmfeTC->YH>0|cRm2&NvYM$@5a$p}qu%oK zHR*Tj0%tFU5RF<>tkbw9L|7jI0{{fc|DwN)E9$k{sck%1573O=W6qR5SL9CX@$OkA z5$?&APj}ZO-TD)!GqZHzERIX&?z`yf$I6Szrg?hKA0DsF-7XbM4QH=?J1~eqiW#R= zNlZ-;@xX_i8-k!gRzs>iY9nR=BAgH~1$hLlp6PJ9&Fi(z&iHR6D7KpUt?~;+;1bN$ zQ|JYjf~Y$1##u_eHcN+H)fq(YwH@=1h`Gg~+{J^Tfqs9*?#Xj@6uLwYp zGMrDB2TrqCht%c;wv&GaCe7AfUSK263tWP^dJ4Tjfr3|a3-j-awn@F?5A(~VTLnkf g?(2<{irkwt(z8k delta 748 zcmb7B%`O8$9G@y7iyI<75>DbE{`0Y&87EUpkw{9MW$o-BrK??Q6^XMOnOE=z9>kFs za2JV#xY&kBuoBL{{JyV;pNB3d7C>Mj1r(@Li}yE!+F@fih-StxbuiLlHJpvSy~vv) z02~7_ki=zls(#`f0IQp@u*>-lkypp#qosyiE*Dp(*OgLB#iYn8%?+hW z;IHh*qkexr4&1WhwfLQ0UP-)ddz!n;M5=bX?Y6JfnAR;v`ssMW>~j7olM>!k+6Qu( zP-M?K9?mJI#uzP#Fd)F=z9c?Kmjm}G1ID*}YzmSD2vZ?3YNFJYRKWklnQ zgZ`lj@1lR-+>Uhm=PnnZ0TUv4fC<-vyWBH|6hQc}6=)rZKr+n{2I68=YlRNyTA{yA zN7Y)ChF+|uq5q+oPerYA`hUIF&U9V;*t|&9dgKl}~**gFL diff --git a/.bzr/checkout/merge-hashes b/.bzr/checkout/merge-hashes new file mode 100644 index 00000000..53185409 --- /dev/null +++ b/.bzr/checkout/merge-hashes @@ -0,0 +1,9 @@ +BZR merge-modified list format 1 +file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.1 +hash: b508b0a39d8ef9a4c8157dd6c00eb75e653a9ac6 + +file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.2 +hash: 3b29a2f1e398a822c48dcfbc70a7488981d380a2 + +file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.5 +hash: d130628966ba26d7f975099d310d1ec06c46ef8e diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx index f777e365..327403fc 100644 --- a/.bzr/repository/inventory.kndx +++ b/.bzr/repository/inventory.kndx @@ -74,16 +74,16 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--pa Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-11 line-delta 30485 318 70 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-12 line-delta 30803 371 71 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--base-0 line-delta 31174 179 72 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 31353 386 72 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 31739 797 73 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 line-delta 32536 318 75 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 line-delta 32854 317 76 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 line-delta 33171 387 77 74 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 33558 796 78 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 34354 386 79 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 line-delta 34740 318 80 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 line-delta 35058 179 81 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 35237 799 82 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 31353 797 73 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 line-delta 32150 318 74 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 line-delta 32468 317 75 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 line-delta 32785 387 76 .Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 33172 796 77 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 line-delta 33968 386 78 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 line-delta 34354 318 79 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 line-delta 34672 179 80 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 34851 386 72 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 35237 799 81 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 line-delta 36036 315 83 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 line-delta 36351 387 84 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 line-delta 36738 319 85 : @@ -138,4 +138,7 @@ cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz fulltext 60676 1103 133 : lamont@mib-20070926194432-f8un38pb6snfs55t line-delta 61779 304 134 : lamont@mib-20070926194801-xpo9hnwvqi53nblb line-delta 62083 303 135 : doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 62386 419 136 : -doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62805 372 137 : \ No newline at end of file +doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62805 372 137 : +doko@salsa-20071004110523-ab0qzrldakrxi9ap fulltext 63177 1086 138 : +cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf line-delta 64263 375 139 : +cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 line-delta 64638 307 140 : \ No newline at end of file diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit index edd443499e6dcd2fe2d4ece704411721453cc0e9..d3f5ce7d57bbaaa23a5648e95ad7da05a26662ee 100644 GIT binary patch delta 1810 zcmV+t2krRD?E|s<1F(a7lTE`9vlM)r4YPxKgaNa$i5P8vABzY8000000{_*QU2oeq z6o&8fD+~kcozlZ^GHr@%9WbnDw*eh6>`FK!4=pvaGv>O(#9A>;0)^9nYtqfAaLj$@5e< zG@&aBs{wsO=hH1Mr<48abuhoGo7mKA3h_GHK3%8gZ_s6@PPceqB?J-`2p;|T7>JZR^V3L7OQd&eR&9{e)#Y?D(A7{b zD`e+WM*%E>wZeO?6t^;Ro0);sfL!vJn9BH;}Q=OH<8v^N4*C@GB8FypK_$cc4N;oyQBO;_b>eABf<`KoJaSw3loXAREt z!s)yH!bQNgYwLi`Y3SxpX2Y}c*J@S1!nQ1R$;FvuXIz$9gen=c3{K%jd?a6E`?271z%&~5No4Tc^7;KOLDWW%lz-P0nyk9%dJ&dsCcJnA$ z z<1h?{cmE1OL#H$q^<}BO6gL;W?RG(ysKkLIrMBXx_v_Co&^vSu+JysuLGpe1fShrh z`jSc5zxq0r{4@Amav%J#4&`vm8Eb(t34&_|w=Z%&9kuMuaT>b)OCp*`t6OOyFfB|M zc|sl(N2Nq(6SP6<7Pa&e8n%KJG(Y-0W3FX_7FX~)IAgnKUC zBCZ^O0k#H8vOnPBbLaCGhq9&Q=*MNL@6lub@m$S@R6JKV?L2HKw+b~RFdo~M1=NXg zVYspZxU`CC8I3Vael+!emR*5q(^7Kx*Z^OF_=g$K7*5r9!&38qh7bjCI*7XPn(7qUeJaZ8no>aW4GXp<-nK(!L@`%eH;8q`}?`nsyMlV zNTQ&2+zXFV7N|8iYjZ47m99cwVGXSGsHMo*9OjTcH{s$#iv5k$vF~i!P(?}aFU@4b zG}VSaW`%AuIad>*Zdy;K@qO)TUhP{9$?RhAgPFBy-P&$-6qd(H_zRis)7rcr&SqzW zG1_pklCa{^jBsTD3Sdj1B-qZ6J`XnReH-_beAs>r^*=oJThGJYkmRq)3C*=dhl7YFXD9pDQp4&0MA{S A@Bjb+ delta 28 kcmdn^oB8Bh<_*nNn{_){7$+}i}0abXD0l!4##jfaf zMTQ&>|sud^L`~dZ(?)W$Y001A02mk67>a<6t`hSBKVTW>JUj2AIg05`L#uiaM0sOY(=cN-zUw{mcrXO>OAnt>F;Y`%cjTfj?>RNq9_`6&hzlWQOmx-#_wxk- z#x6G&@4w@?{{vN<%KGX|c?6bO)d5MoX^%4#LJmc5Cnd#3NrVWa2n|y#C1F*}MlTGo39bR2;=2 zaSDG_JY_1LF%g`x|AJQQ8of;KG|Iw~zrn&6dqQ42WX+cREf%(^3^~;K-y| z0eL17Yt7N7jZ71e(#8xda|X}|bWP?6CcA%(Y?R!02-8AO`QxsN>Y{F{$e*ez%j@~T Si1T*i0{H=-giMA40RRBf?BXf_ delta 23 hcmV+y0O;s$W1F*}MvzM2FT9e9_%(EEsg94=64Iuyk diff --git a/.bzr/repository/revisions.kndx b/.bzr/repository/revisions.kndx index 51b294a6..05436f8a 100644 --- a/.bzr/repository/revisions.kndx +++ b/.bzr/repository/revisions.kndx @@ -74,16 +74,16 @@ Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--pa Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-11 fulltext 23212 316 70 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-12 fulltext 23528 329 71 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--base-0 fulltext 23857 324 72 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 fulltext 24181 323 72 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 24504 318 73 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 fulltext 24822 325 75 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 fulltext 25147 316 76 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 fulltext 25463 404 77 74 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 25867 348 78 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 fulltext 26215 329 79 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 fulltext 26544 314 80 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 fulltext 26858 319 81 : -Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 27177 326 82 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-1 fulltext 24181 318 73 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-2 fulltext 24499 325 74 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-3 fulltext 24824 316 75 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-4 fulltext 25140 404 76 .Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-5 fulltext 25544 348 77 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-6 fulltext 25892 329 78 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--patch-7 fulltext 26221 314 79 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.25--version-0 fulltext 26535 319 80 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 fulltext 26854 323 72 : +Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--base-0 fulltext 27177 326 81 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-1 fulltext 27503 317 83 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-2 fulltext 27820 324 84 : Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.26--patch-3 fulltext 28144 353 85 : @@ -138,4 +138,7 @@ cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz fulltext 45093 354 133 : lamont@mib-20070926194432-f8un38pb6snfs55t fulltext 45447 408 134 : lamont@mib-20070926194801-xpo9hnwvqi53nblb fulltext 45855 357 135 : doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 46212 452 136 : -doko@salsa-20071004092543-qzap04qfo6i77h29 fulltext 46664 463 137 : \ No newline at end of file +doko@salsa-20071004092543-qzap04qfo6i77h29 fulltext 46664 463 137 : +doko@salsa-20071004110523-ab0qzrldakrxi9ap fulltext 47127 445 138 : +cjwatson@canonical.com-20071004132601-q4vup64i8pslbjqf fulltext 47572 474 139 : +cjwatson@canonical.com-20071004132641-fysek6ezu9658kb8 fulltext 48046 355 140 : \ No newline at end of file diff --git a/.bzr/repository/revisions.knit b/.bzr/repository/revisions.knit index 85b1d9af338ce28598e2e829b891a1cc4b181354..67927d33b02b55d547c7c0e5833da767411c10b4 100644 GIT binary patch delta 1309 zcmV+&1>*Xb@B)$g0t z6(bf`eK`T+=S>`SUsdg*`v}7jqu9m)oZIBrm)tgrx~SUj7%`kP=Nr!Gys;A~d$b?D z7`#X`N-IWb&KNB+o{Em1u5M7`=)Rjq%)mHst*f#`p?D)3rHf8Uo!6X|wW_tAVuRXhJ~OlFuT9-Utt$2I~=?hOl|qKOMq`fVOTFp(OhGuXBE7su}-$@`^3q17A~^&yT_jP4)tHb(IzW$o}R8^ruj+R(o|J{ zpEU&5QEB}Uot>T01%rNfKVM)HW2DzPG08rij69Ox(WN(XQRP?vtKvf^R`=<42~O%i zK5p^@Jn+7d>;eD)ABzY8000000{@*-U2EGg6n)RHxM` zF*ux$VX&vZUEPm=bI&P7F{@_t`K4pl~!){;sUXP6|i76P+65{b$qN~;o8B(gZlCQCo4t?MupEMcI{KqgrCxbY2&g2_C8&15bV zPvb>dMKwh#i6}|pGOtCZWSUVbQ3?h}78_j^>}{$U1l^Gj*!2YyA{PmlaVlo1OkYb+ z)=d3(LS*?e99Sl?X!TyO5~zI`bK1Pg)M78LrP+zi!ei_4WRl=X6i>0_`zO~{ zxO2aCjy;3Z}cawI2cgw!VO! zAja2`*lI$idgBM4`~jpUun_mU$C_x=jRqB|#pjWMXP zRjD7*WrXpN(%9evb(Mbov-%Qc(@nbrW_0eE5i7>zf+yzfQ|A=?lhHnSXY{l)VJ<6x zmH}{9SAw(BUJ{-Ketjr^(a7^4i6jFEs1>v*S|uBWXe^h!X<8v`Y-$U9sF_qy93rmn ze^!`hmovtWK8MM9^70)`9;W>Gv&X|JKT={toOSMKLy7Y%`W)irm|iv8o|qjftkG~T zjSy_mx;4r)Y8Xv58p}YT5xl14W^r_5NB=f8CE3lGvYwZYGNxF61DpffRpMIu3LZOJ z3jo>|hpjc~6ZR1&)XDi1S+7fn9f!mIRxb{Vj@wkJzwhc8(f(Q)SozM^k411NmoyD; z@0ODNM%~{7mKYX{* Thu, 04 Oct 2007 14:26:06 +0100 + livecd-rootfs (0.39) gutsy; urgency=low * Print the file size in fdupes output as well. diff --git a/livecd.sh b/livecd.sh index ff73cd49..770893ad 100755 --- a/livecd.sh +++ b/livecd.sh @@ -63,6 +63,7 @@ export TTY=unknown export TERM=vt100 export DEBIAN_FRONTEND=noninteractive export LANG=C +export CASPER_GENERATE_UUID=1 SRCMIRROR=http://archive.ubuntu.com/ubuntu COMP="main restricted" ARCH=$(dpkg --print-installation-architecture)