From b8eb3df487e6b2540761c746741ab8a2923ec388 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Thu, 14 Aug 2025 11:12:55 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddebian13=E5=AE=89?= =?UTF-8?q?=E8=A3=85PVE9=E6=97=B6=E8=AF=81=E4=B9=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=81=E4=B9=A6=E6=BA=90=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ gpg/proxmox-archive-keyring-trixie.gpg | Bin 0 -> 2372 bytes gpg/proxmox-release-bookworm.gpg | Bin 0 -> 1187 bytes gpg/proxmox-ve-release-4.x.gpg | Bin 0 -> 1173 bytes gpg/proxmox-ve-release-5.x.gpg | Bin 0 -> 1181 bytes gpg/proxmox-ve-release-6.x.gpg | Bin 0 -> 1202 bytes scripts/install_pve.sh | 18 +++++++++--------- 7 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 gpg/proxmox-archive-keyring-trixie.gpg create mode 100644 gpg/proxmox-release-bookworm.gpg create mode 100644 gpg/proxmox-ve-release-4.x.gpg create mode 100644 gpg/proxmox-ve-release-5.x.gpg create mode 100644 gpg/proxmox-ve-release-6.x.gpg diff --git a/README.md b/README.md index c2bd585..bf44b8c 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ 2025.08.14 - 修复环境检测，支持PVE9的Debian13进行安装 +- 修复sysctl设置失效的问题，适配debian13系统的新设置方式 +- 修复debian13安装PVE9时证书适配错误的问题，修改证书源位置 [更新日志](CHANGELOG.md) diff --git a/gpg/proxmox-archive-keyring-trixie.gpg b/gpg/proxmox-archive-keyring-trixie.gpg new file mode 100644 index 0000000000000000000000000000000000000000..55fe630c50f082d3e0d1ac3eafa32e9668d14bc2 GIT binary patch literal 2372 zcmbW%c{~%09|!P_&CD5^#U!H;GUSR`bCq-C=o+~mVRGm8h+OeFMk}T4$q_=R#F$}Z zj$F$%Z2=J!0W=lA^k`{VcL_w#*y{`%L(9 zQD49|c_TMXwa9r*(FR#%Z)~IaT>Jxwbta6rELN6pl=5qMK=Ey@&U%SctV;?9dt&f<`Z$x;_4Cb9yx-XN-54>1P#= z*Vf|j(b)SdChxMtTB;iQ18D7;(_9u=lxK)7#Mw5yZnRQc9$q$ znXPk8LiPM30Mkxe|u~h ze1FR@vtR&L=EHIk)BV`|FlW4zaeAC(R8HESPr7+wJ`>6^j&`3pVOS_-f9Y-AL284* zGwe6AdIU*1x^%V}0+Cg80A-wgzt*t~8B(#EqlU4J0AfG@aKOMmG$<+{C`!&GD9ArD zC^SIM!TXlCN0_&qwRf}}I{2UOnb3bi?0;`{ub==-2b~0x015ywl1R|Tye=bdYDtmF3qtuJJbW+#D8C>NNRo#a$Ri8nfhPb2phy0# zG;NCR@ynlx`ed6&H8Opk^2^02gV}=L!!;dkg{FC_b9J(6TYL1nT*TF^8KYlc@5@G3 zeduY~zZAbOYf%h{y}seDv()?8zv_N9z&OrL6GI#|D)%$GonUg4lu8>&cnw_9fnBu% zQer}^fqFv5&-8>|;3@#M7dJl;4(=%wPU&gfwQ!T$lXNReH1|+i1uHndG0ZwmlR#J_ zP}O`X9M~Z8M;7sC#%%1MuX!E>DqbCS9gX7z@gHYlVsVyvPM3A!OFGwW^~aNyxn7Hz zs>;O%e6uy5#FAx22Sgqt2Ah^eiJ3yQ?PlTO#kPEH{9Zv|dG!~A^?O$d>NN7Mc;-YovP4or_?lJBQNn6`STQ2d z^tyL~Lq^$BlUzCADJalQdw8#&c-c4twIk zM+3x3AzOXyB-}2&xNBP)bAm+#QqQ$IZ6Jfs8>{t=Mz0TbhHmY-TchT~zsSK2M*^oa zA!eD6IHgvhIRe;3{90LwZW3$bRx3aaOe!#K(rhae*Smt*aHIYPfOk!62BC@OXm|)p!AsoGoJB_N}}6jLb4=!QuK`^Vi#HX+At&gE@NDGR^AAR_{j38eY#m04mn)I`y_}Tx$&7&!2lr9wz8P zY?h6Dd|w`(XFogfGfi}Tok{Pw3u5+fFD!$9_4>>|r)QphBmgcNsL|R4`Hhd9Z3`2Z zQXw&WN0V;+G-f9@-LmnlS@o5m@h+K%R@y}v8w#)abq8OP`RY{^MgNnWseHtezg8gl zDdw`w(km!su}a=(CHZ40s`UF&Ld`N@l|vY|@OQr%45ls`&1!$#as)WEoOt^WQTqQ9 z&qX0d?|?C?AKOM8MrRcwgSaG!ZMx)M%l;=&|5lD%6Fqdj zOX_O%H(bqC`Qr}W<< zKQ*yXnAs~Du}hQ2v}}0ypvP4*At6AIQTu34K(UgCFE6USVXqj6MGQ_&+z|^ z56b)=gIyw&#XNd6#uZWO@fTfvoICR|-`gr!+DnzI+m~=x-Z&cAr2-!azCZ+o1_ z)_#JHy7`yZ&mo#n38p`w!anV@A+XX@H6~6C!Vzm9MW`3`<(LwL^HtWD`IQ_F83IrQ zdt&^S;s)WXNqG1*W6aJT_c*(8qT@wC*~o~HO7no@^Xk)Jq85_9Uxy(RrTr>Zd^;`j zFaE?~?Y)({;Ljffk&&pvKgZPj3ZA0u=g)HcH)`}U4s}pjc%rmORg1Iw%I^I?^exZP z?=8e>pa&Mk;V27k<2jrR{Et%8bf@%2^1bUmH&4yyVrTjq5wXDHjeXjtP}%vNEXxf`{LveH!|+{sYBiV@v=5 literal 0 HcmV?d00001 diff --git a/gpg/proxmox-release-bookworm.gpg b/gpg/proxmox-release-bookworm.gpg new file mode 100644 index 0000000000000000000000000000000000000000..8e6e95e806e13e71e6175e9433e61c8b965edaec GIT binary patch literal 1187 zcmV;U1YG->0u2OXgJqln5CF^rXIo4a$3{!qI0{XK^pS@vp;huGOd+dKK}<2F8PfX1 zWf%Lxk-IT9WvvaMILjf4;grdsH+|(D6h18Mz72WuTXMP*9R(1aO)0SdrPuZ6k(zql`5Jf49aHba}!$=dmx-1s&1qbX!%19!rr1?HF zYsk1fmeD`5yL(+S(YnJgJa=oubCegXLn7|juqzqZBrgAuWo>Djgl>tqaPIC_y0>1@ z6|duk)NVxb_w7~8E_>YK6c@(KkbwPnl0uiwEX~3NN^qQW13nmd0KksaCa!iT!4w*W z_^5BYCr+zzb^$e{@NY?!ztqLujAb^Rfn2$xqg;}*+5acDnC)FT6No^;-=l@^!nPCB zqJFgQs#u50RcjZQ&ve$Y_ucVvkJSUv(P>I`TQoB42EFF}xxM+F%^5_VQ6?Cvmjgw~ zg-bqnEicROZd(Bo_djVbPI?u=`!uK0Px-|U2Bu9_u7IrJm;lj9G98GXAzRR&H@F2S z5$vJas!OX&3ZOvko-THjD0!scq6Y^aCQ<~7Gt2VA z?5BvxsA9&kMlDj=arG;cicsk#jpLH=)O$^-wyWp@MEcpDvu#p>Bjov+dvi%-+ ztJ284{ZW4X9!R19ds_5hHRQ>eYpav206~0TF+PygJ*R0sbbvx;l!m>{fU*JVH5FJ& z0l0c`O93|wL7+DbsZOW>uSfUNYW|2Lo!mDtf=FK={1#uKfkj~_@dYDOvpbC`y%QTt z8!xN|h3pm1A@Gfm^@`tn&S*uF2MH3ab6Px3>~9Di*gktsNs?4nHGZSR^G!I`gedM~ zSZXf4p8FQi zs<`~{1|zS;dAq<(lTB2_R*FA|s-x2M>&3@QO*RnzO#$ z!+~v^sL%u8W47sY1j5tedb;L>Jd^-?xipbWa2%u`Tb9HWE!?)_?y^#_1OT41Lucrrt8P~fescuij(7RHJ{FZX)e=nkm!eMEf!9Wi$pyGWq zEBH#f!9Keh>xxUJmUhj8c2+;J+pBM35w$PDw$M<@dO7QGxqvvl{PV2)8>oIwx8jxFvNm-4wSn0v# z_>1rmaQyWsZU8%?5amp%4<|{sg+K=7s1m+IStVsmW~Q7qQSrI^9oOv2)GiGe0ssuF z08fF6z+v@zwcO6!b~<$aT13!QV-TReb?F}t7h8dX@}y2SU{3@9i%Su>LusA=sK-`% z5Ko0HJPu8tXr?N{>PxMbKol}F#l9}ta>YN80spP|Ki3xiSy2Qk@2;Fjg{PS54J-<# z6{M?BU6bd<55(ZQPQ>J_SqSe}olszYjX>m`PTM%$T^wBs()_|7ROw zdP}Q}&gIM^>=S54v@uX}Z+LBQcpy?`Y-M3{Wgtssc_2J+a&LHTZ+I+>whxuBQF94rST*Y+I19_b^Y^rh-%eVw~Nh|IEn+02jncLt=5*><-hPXr_ zRI;BLw7CKe1W5+N$`A+u_uF;?JL$>Xn`bN)|o%_Fa&%EaVi41IgpsyjAl@7IC%OTGbq+@QtpL>9SEPatAZVmHGe`TQj5OjrjZ;uClEc>{@9O0ZX*}9ASt0~s< zw~hMyRlRRRDu(u(!$XqNZa95BAcUE+?Z`p{$H-`a)_pTXp@E#v!5H|wU+i=TaUniG z?Kw<~$n$2QSV%K}00RXG0D%-6N7SKs<_mk!93Tuk{@Xl4%X!bL6L51>P44=e&?~YIPXui)#vngti!sDqe1!EV(I>07CI7~f)#iB zWq39UPpO!e4@S;%RF30VCV3UIHjN>bT;@eqMbO%PfqcjXTiUC7M=}Xp^0SMZ@GLhN z8I(7*KB8htVOdAsgosH57!d*h2?YX42E)n%8w>yn2@t|M$Ml$o`C7uV0G~k&ElKM2 nV#NjbHU{QA)i~F-GR**;91u!w?io1+7@AGol zsH@ILM|Nb@iXiJR!?bucn(rCU?!EmI{EML$~s&c;(5!^@tb|ry{`aO#N9+z^lU6`^U=!f7Tc$! zoJu!T$l!B7y`0~@JAD*={9he%hY3_Mf^*m_n{^#=7AZ`V;vucOl(~YCCW7VZe`h<2?yaA!=_po7;jXswMD!B8Z8z zv~|Y_Wr@@QYUi%aIdM4CyU;e1HqVb+HdJ^)i{)PH%+mr(Dvyg5H|>w4qss@3b=}2B zJVsD78XMLlq!+f)>p@F#6Hg?f4tz~`wNZO%${Xjm>06*^Ldp3*24+}O`)fDgL+eY0 zly<6cva%?+#m{)d>C-*cJO03{B;`!5Q)oB~kK)iFk$rTH+FUqC)t^o&dlK4i?MM<{ z1SU1+FvTC!pxXcu0RRECNlxCFZDnqBAT=&{AW~&) zWnpt=AWLO=AUtq#Z+LBQcr9{eY-M3{Wk7IpZ+LBQcrIgaZ9a(tKLis22mmPs0$0Pz zhXNY|1ql+&0{{mL2?z%R0s#gU2m%QT3j`Jd0|5da0Rk6*0162Z4VoEH;_n6nIz$it zD62qC$c7Ov6A}vxxO3<;ku+a|R)os7jNY@JZ0P1f6_|CzlY;Si>S;2902em#|7NW2>mD{k4seJ&(fq zKbBzToOheFC9lLCveIcBXbe2>4;<$fAUb)={>gB0=oB}<=IWOsdVX6XII*|BN~?M$ zWHpZ-)zgJP<2#`Onrs!pt^LXQD@AhXs*iy{ zGRVl$2mg#JlKI=JbN2)Q^@YYqmVS#jA2w}xrp0`|ERjkM#gJ6>YiM-?0 zaGVG(Nrs}d?IiohfiKng(O8Fh`a?mMW0(T@+itGYCodZ!=xW5$W~QiniSA{$&RDk0 zDO5xvT6p{&cgVhKc5_1n_QDP5TpK`u=3se|ZVQ8}8h6U(82z8})ztXRz)7WwAwxA2 z&KNr8DY^SB8XS6U+M3NBD;MArAN}nLN+un7G|s#2IFOq*#h4IJ1CUQG9M6?lxOwS= v%Kl)1hf;D({;(*NGd#D)wu}8xdg|eIA%q2|pVoL}OgjDN+!-q6Et(MSB{?cK literal 0 HcmV?d00001 diff --git a/gpg/proxmox-ve-release-6.x.gpg b/gpg/proxmox-ve-release-6.x.gpg new file mode 100644 index 0000000000000000000000000000000000000000..efebf1c5fec7ca8522a06f4b42e04b554f9d079c GIT binary patch literal 1202 zcmV;j1Wo&y0u2OP@^=0K5CE#PtzH*^erG>N(h`YFy^<1#%GhkWYn&PUcK8mln{DvA zemc%?diZ9uI~#s^Og=|@y0dU<@g_J1z<WT5%+|A0-$WtpSP*0|U7468wdnrRAr?$fatadM*LL*-^8Y}g|(v$@K zn}DTGZy|Flj+qe5@|S9>_O^wba6F)0M`al>!N<}M_he(b3A_WfrFaqW{M=r3e5ZL|^#uoGb!XNgi0bQmb9<^%{Us{eoS`?!NTM3SG9+=aRv7Z!TNwTwQZ~~$?QA6XJYzQMsq3iOaXY+z zg3X7Zt@>eXqP>{t%t}<7>v6wpUjBGulmKN&?_{oEo}-pcYQ$zp?KHXuiz}8nPqs#i zleG{w+V54CZbJT7ZWu1wk+nu$-zac8>f+u=$j#fRUFfdv^BHX+LJJSUxe#&ln!s5Q zlwkwS{Zp-U+J68M0RRECNlxCFZDnqBAT};|AW~&) zWnpt=AWLO=AUtq#Z+LBQcr9{eY-M3{Wk7IpZ+LBQcrIgaZ9a(tR0I}P0viJb2@=c$00j#P2nPZN6$l9m3jzcd0s{d8 z9svRufB*^!5PR~0E{bl5;Lv3d0HaA4b5C@n+ay#v^r#-w+aDB49B&JeI*MjT0V=<` zEpT_0o{QzAK0XW+{c-~OOsv2v+_u{y35RSNv$3cUY2y6y^{3^{4YxZh%z701sd-+o zr*3(d27rcA2$utU>d;o6nLOVJ5vLsX>^g(xymn(;`{|s+sF>~jqg-0UV{-BMVZW|* z3Nz^|u+SHhs4{KKb~VB3dM*;ONn|_JXxWA~5#iu`)`;Yb$)P+?MJ!PrN2qBtz5zBm z><^9Qg&>4aDd>U~us)hmAHl!Ng6@UjK8UdYz9QR(=?<8T3Msg*&|bO4q&L83WGrsO zppvSf<=nf(5zTWi3D&6A1-zq?&DBTed|( zTzaESJ#}PJs5(1RNmVrRCbfI4qj|`}<^|K>@96i0@I)3ao&`W* QS%$d}Ac1>LWWW6HVu#o=bN~PV literal 0 HcmV?d00001 diff --git a/scripts/install_pve.sh b/scripts/install_pve.sh index ca27c62..fd0796c 100644 --- a/scripts/install_pve.sh +++ b/scripts/install_pve.sh @@ -938,8 +938,8 @@ check_system_requirements() { # 检测系统信息 detect_system_info() { - _yellow "Detecting system information, will probably stay on the page for up to 1~2 minutes" - _yellow "正在检测系统信息，大概会停留在该页面最多1~2分钟" + _yellow "Detecting system information, will probably stay on the page for up to 1~2 minutes at most" + _yellow "正在检测系统信息，最多会停留在该页面 1~2 分钟" # 重启网络服务 restart_network_service # 收集IP地址信息 @@ -1472,18 +1472,18 @@ add_pve_gpg_key() { chmod +r /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg fi ;; - bookworm|trixie) + bookworm) if [ ! -f "/etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg" ]; then wget http://download.proxmox.com/debian/proxmox-release-bookworm.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg chmod +r /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg fi ;; - # trixie) - # if [ ! -f "/etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg" ]; then - # wget http://download.proxmox.com/debian/proxmox-release-trixie.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg - # chmod +r /etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg - # fi - # ;; + trixie) + if [ ! -f "/etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg" ]; then + wget https://enterprise.proxmox.com/debian/proxmox-archive-keyring-trixie.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg + chmod +r /etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg + fi + ;; *) _red "Error: Unsupported Debian version" if ! confirm_continue "是否要继续安装(识别到不是Debian9~Debian12的范围)？"; then