From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=altlinux.org; s=dkim; h=Subject:In-Reply-To:Content-Type:MIME-Version: References:Message-ID:To:From:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AWNOd4H1j/ZjQUdLKK7QsINOT7S2Xn6/UW7bjWrzczo=; b=k4CydwCaxs0AHCZQBoHv+VbasY 0uq6LM14aS0TJ5kVp1npu2hNeKocE6TMygEkXuZkMMYazRAvycgCgCkY/u5xugdc33tc+hA/mQQwD NIvZsTjJIEBH8PGyZPX/OK5XsCK9RohQkOqz5JCw15U3joQhIHvFfqkS20vOZIislh/DArPECupKe ZIhx5eLQ8er8MvRENPB/6d28QYpu8uMO0SPyrovcLOqFMnMEoZc2SljWw8iMs/USg6G6bqFmcOH0v llH6YCDW0MVWAZ9VjOvNUA8ixDcrl2vwjMYrlAJm3HSH3kEcxwqz2YW8xiPbfnZvS8nKWHJgy4iJf wK0ekxSw==; Date: Wed, 13 Oct 2021 21:50:26 +0300 From: Arseny Maslennikov To: make-initrd@lists.altlinux.org Message-ID: References: <90978b29-a2f6-ff0d-afdb-2bc3b4f7933c@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="n+CN8UXAV6STTqE6" Content-Disposition: inline In-Reply-To: <90978b29-a2f6-ff0d-afdb-2bc3b4f7933c@gmail.com> OpenPGP: url=http://grep.cs.msu.ru/~ar/pgp-key.asc X-SA-Exim-Connect-IP: 37.204.119.143 X-SA-Exim-Mail-From: arseny@altlinux.org X-SA-Exim-Version: 4.2.1 X-SA-Exim-Scanned: No (on mail.cs.msu.ru); Unknown failure Subject: [make-initrd] broken patches? (Re: [PATCH v4 0/4] split pipeline into 4 features) X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2021 18:50:32 -0000 Archived-At: List-Archive: --n+CN8UXAV6STTqE6 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 13, 2021 at 08:20:53PM +0300, Leonid Krivoshein wrote: > =D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D1=82! >=20 >=20 > =D0=9F=D1=80=D0=BE=D0=B1=D0=BD=D1=8B=D0=B9 =D1=88=D0=B0=D1=80 -- =D0=BD= =D0=B5 =D1=87=D1=82=D0=BE=D0=B1=D1=8B =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8= =D0=BC=D0=B8=D1=82=D1=8C, =D0=B0 =D1=87=D1=82=D0=BE=D0=B1=D1=8B =D0=BE=D1= =86=D0=B5=D0=BD=D0=B8=D1=82=D1=8C =D1=81=D0=B0=D0=BC=D1=83=D1=8E =D1=81=D0= =BB=D0=BE=D0=B6=D0=BD=D1=83=D1=8E =D1=87=D0=B0=D1=81=D1=82=D1=8C. > =D0=95=D1=81=D0=BB=D0=B8 =D0=B2=D1=81=D1=91 =D1=85=D0=BE=D1=80=D0=BE=D1= =88=D0=BE, =D0=B7=D0=B0 =D0=BD=D0=B5=D0=B9 =D0=B1=D1=83=D0=B4=D1=83=D1=82 = =D0=B5=D1=89=D1=91 =D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D1=8B, =D0=BA=D0=BE= =D1=82=D0=BE=D1=80=D1=8B=D0=B5 =D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D1=8F= =D1=8E=D1=82=D1=81=D1=8F =D0=B4=D0=BE=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE > =D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE. =D0=9D=D0=BE =D0=BF=D0=B5=D1=80=D0= =B2=D1=8B=D0=B5 =D1=87=D0=B5=D1=82=D1=8B=D1=80=D0=B5 =D0=BA=D0=BE=D0=BC=D0= =BC=D0=B8=D1=82=D0=B0 -- =D1=8D=D1=82=D0=BE =D1=80=D0=B0=D0=B7=D0=B4=D0=B5= =D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 pipeline =D0=BD=D0=B0 =D1=87=D0=B5=D1=82=D1= =8B=D1=80=D0=B5 =D1=87=D0=B0=D1=81=D1=82=D0=B8, > =D0=BD=D0=B5=D1=82 =D1=81=D0=BC=D1=8B=D1=81=D0=BB =D1=82=D0=B0=D0=BA=D0= =BE=D0=B5 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B8=D1=82=D1=8C =D0= =BA=D0=B0=D0=BA =D1=84=D0=BE=D1=80=D0=BA =D1=80=D0=B0=D0=B4=D0=B8 =D1=84=D0= =BE=D1=80=D0=BA=D0=B0, =D0=B2 =D1=82=D0=B0=D0=BA=D0=BE=D0=BC =D0=B2=D0=B8= =D0=B4=D0=B5 =D0=BD=D0=B5 =D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5= =D1=82=D1=81=D1=8F > =D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD= =D0=B0=D1=8F =D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB= =D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C. >=20 =D0=9F=D0=B0=D1=82=D1=87=D0=B8 =D0=BF=D0=BE=D1=87=D0=B5=D0=BC=D1=83-=D1=82= =D0=BE =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D1=8E=D1=82=D1=81=D1=8F =D0=B1= =D0=B8=D1=82=D1=8B=D0=B5; =D0=BD=D0=B5 =D0=B7=D0=BD=D0=B0=D1=8E, =D0=BA=D0= =B0=D0=BA =D0=BE=D0=BD=D0=B8 =D1=83 =D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D1= =8F =D0=BF=D1=80=D0=B8=D0=BA=D0=BB=D0=B0=D0=B4=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1= =81=D1=8F. % git am < split-pipeline-into-4-features.mbox warning: Patch sent with format=3Dflowed; space at the end of lines might= be lost. Applying: Separate new feature of bootchain-core from pipeline error: corrupt patch at line 181 Patch failed at 0001 Separate new feature of bootchain-core from pipeline hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [128] % =D0=9D=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80: index 89d9de5..1e95e7d 100755 --- a/features/pipeline/data/etc/rc.d/init.d/pipeline +++ b/features/bootchain-core/data/etc/rc.d/init.d/bootchain @@ -1,6 +1,6 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: pipeline +# Provides: bootchain # Required-Start: uevent udev # Should-Start: # Required-Stop: =D0=97=D0=B4=D0=B5=D1=81=D1=8C =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BD= =D0=BE, =D1=87=D1=82=D0=BE =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8 =D0=BA=D0= =BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0 =D0=B2 =D1=84=D0=B0=D0=B9=D0= =BB=D0=B5 `f/p/d/etc/rc.d/init.d/p` =D0=BD=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D1=8E=D1=82=D1=81=D1=8F =D1=81 =D0=BF= =D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D0=B0 =D0=B8 =D0=BF=D0=BE=D1=82=D0=BE=D0=BC = #, =D0=B0 =D0=BF=D0=BE=D0=B4=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D0=BC=D0=B0=D1= =8F =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B0, =D0=B3=D0=B4=D0=B5 Provides, =D0=BD=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D1=81 =D1=81= =D0=B0=D0=BC=D0=BE=D0=B3=D0=BE #. =D0=92 =D1=81=D0=B0=D0=BC=D0=BE=D0=BC =D1= =82=D0=BE=D0=BC =D0=B8=D0=BD=D0=B8=D1=82-=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1= =82=D0=B5 =D0=B2=D1=81=D1=8F =D0=BF=D1=80=D0=B5=D0=B0=D0=BC=D0=B1=D1=83=D0= =BB=D0=B0 =D0=BD=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D1=81 =D0=BF=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0=BE =D1=81=D0=B8=D0=BC=D0=B2= =D0=BE=D0=BB=D0=B0 #. @@ -13,14 +13,14 @@ . /.initrd/initenv . /etc/init.d/template -NAME=3Dpipelined +NAME=3Dbootchained PIDFILE=3D"/var/run/$NAME.pid" ARGS=3D"--lockfile $LOCKFILE --pidfile $PIDFILE --name $NAME=20 --displayname $NAME" =D0=92=D0=BE=D1=82 =D1=82=D1=83=D1=82 =D0=BA=D1=82=D0=BE-=D1=82=D0=BE =D1= =81=D1=8A=D0=B5=D0=BB =D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8C=D0=BD=D1= =8B=D0=B5 =D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8B =D0=B2 =D0=BD=D0=B0=D1= =87=D0=B0=D0=BB=D0=B5 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8, =D0=B8 patch(1)/git-am(1) =D0=B2=D0=B8=D0=B4=D1=8F=D1=82 =D1=8D=D1=82=D1=83 =D1=81= =D1=82=D1=80=D0=BE=D1=87=D0=BA=D1=83 =D0=BA=D0=B0=D0=BA =D0=BF=D0=BE=D0=B4= =D0=BB=D0=B5=D0=B6=D0=B0=D1=89=D1=83=D1=8E =D1=83=D0=B4=D0=B0=D0=BB=D0=B5= =D0=BD=D0=B8=D1=8E =D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BA=D1=83 =D1=81 =D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC `-displa= yname $NAME"`. =D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B9 `-` =D0=BE=D0=BA=D0=B0= =D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D1=81=D0=BB=D1=83=D0=B6= =D0=B5=D0=B1=D0=BD=D1=8B=D0=BC. prepare() { local dir i n - dir=3D/.initrd/pipeline/waitdev + dir=3D/.initrd/bootchain/waitdev =D0=92=D0=BE=D1=82 =D1=82=D1=83=D1=82 =D0=BA=D1=82=D0=BE-=D1=82=D0=BE =D1= =81=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D0=BB =D0=BC=D0=B8=D0=BD=D1=83=D1=81 =D1= =81 =D0=BF=D0=B5=D1=80=D0=B2=D0=BE=D0=B9 =D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0= =B8=D0=B8 =D0=BD=D0=B0 =D1=82=D1=80=D0=B5=D1=82=D1=8C=D1=8E. =D0=A7=D1=83=D1=82=D1=8C =D0=B2=D1=8B=D1=88=D0=B5, =D0=B3=D0=B4=D0=B5 NAME= =3Dpipelined =D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2= =D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D0=B2 bootchained, =D1=82=D0=BE= =D0=B6=D0=B5 - =D0=B8 + =D0=BD=D0=B5 =D1=80=D0=BE=D0=B2=D0=BD=D0=BE =D1=81=D1=82=D0=BE=D1=8F=D1= =82. mkdir -p -- "$dir" i=3D0 @@ -32,7 +32,7 @@ prepare() { start() { RETVAL=3D0 - if [ "${ROOT-}" =3D pipeline ]; then + if [ "${ROOT-}" =3D bootchain ] || [ "${ROOT-}" =3D pipeline ]; then prepare start_daemon --background $ARGS "$NAME" RETVAL=3D$? =D0=97=D0=B4=D0=B5=D1=81=D1=8C =D0=B8=D0=B4=D1=91=D1=82 "=D0=BA=D1=83=D1=81= =D0=BE=D0=BA"/"=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82" (hunk, =D1= =83=D1=81=D1=82=D0=BE=D1=8F=D0=B2=D1=88=D0=B5=D0=B3=D0=BE=D1=81=D1=8F =D1= =80=D1=83=D1=81=D1=81=D0=BA=D0=BE=D0=B3=D0=BE =D1=82=D0=B5=D1=80=D0=BC=D0= =B8=D0=BD=D0=B0 =D0=BD=D0=B5=D1=82), =D0=B2 =D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B5 =D0=BA=D0=BE= =D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE =D0=B7=D0=B0=D1=8F=D0=B2=D0=BB=D0=B5= =D0=BD=D0=BE, =D1=87=D1=82=D0=BE 7 =D1=81=D1=82=D1=80=D0=BE=D0=BA =D0=BF=D1= =80=D0=B5=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D1=8E=D1=82=D1=81=D1=8F =D0=B2 7 = =D1=81=D1=82=D1=80=D0=BE=D0=BA, =D0=BD=D0=BE =D0=BE=D0=BD =D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D1=82 =D0=B2=D1=81=D0=B5=D0=B3= =D0=BE 6: 2 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8 =D0=BA=D0=BE=D0=BD=D1=82= =D0=B5=D0=BA=D1=81=D1=82=D0=B0 =D0=BF=D0=B5=D1=80=D0=B5=D0=B4 -+, =D0=BE=D0= =B4=D0=BD=D0=B0 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B0 =D0=BF=D0=BE=D0=B4=D0= =BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=D1=81=D1=8F, 3 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8 =D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA= =D1=81=D1=82=D0=B0 =D0=BF=D0=BE=D1=81=D0=BB=D0=B5. =D0=9A=D1=82=D0=BE-=D1= =82=D0=BE =D1=83=D0=BA=D1=80=D0=B0=D0=BB =D0=BE=D0=B4=D0=BD=D1=83 =D1=81=D1= =82=D1=80=D0=BE=D0=BA=D1=83 =D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81=D1= =82=D0=B0. =D0=95=D1=81=D0=BB=D0=B8 =D0=BF=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5= =D1=82=D1=8C =D0=B2 =D0=BF=D0=BE=D0=B4=D0=B2=D0=B5=D1=80=D0=B3=D0=B0=D0=B5= =D0=BC=D1=8B=D0=B9 =D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE= =D0=B2=D0=B0=D0=BD=D0=B8=D1=8E/=D0=B7=D0=B0=D0=BF=D0=B0=D1=82=D1=87=D0=B8= =D0=B2=D0=B0=D0=BD=D0=B8=D1=8E =D1=84=D0=B0=D0=B9=D0=BB, =D0=BE=D0=BA=D0=B0=D0=B6=D0=B5=D1=82=D1=81=D1=8F, =D1=87=D1=82=D0=BE =D1=8D= =D1=82=D0=B0 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B0 =D0=BF=D1=83=D1=81=D1=82= =D0=B0, =D0=B8 =D0=B5=D1=91 =D0=BF=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0= =B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 =D0=B2 =D1=84=D0=B0=D0=B9=D0=BB=D0=B5 =D1= =81 =D0=BF=D0=B0=D1=82=D1=87=D0=B5=D0=BC =E2=80=94 =D1=8D=D1=82=D0=BE =D0=B5=D0=B4=D0=B8=D0=BD=D1=81=D1=82=D0=B2=D0=B5=D0=BD= =D0=BD=D1=8B=D0=B9 =D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB-=D0=BC=D0=B0=D1=80= =D0=BA=D0=B5=D1=80 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8 =D0=BA=D0=BE=D0=BD= =D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0 =D0=B8 =D0=B2=D1=81=D1=91, =D0=BF=D0= =B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81 =D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8. =D0=A2=D0=B0=D0=BA=D0=B8=D1=85 =D0=BF=D0=BE=D0=B2=D1=80=D0=B5=D0=B6=D0=B4= =D0=B5=D0=BD=D0=B8=D0=B9 =D0=BF=D0=B0=D1=82=D1=87=D0=B0 =D1=82=D0=B0=D0=BC = =D0=B8 =D0=B2 =D0=B4=D1=80=D1=83=D0=B3=D0=B8=D1=85 =D0=BA=D0=BE=D0=BC=D0=BC= =D0=B8=D1=82=D0=B0=D1=85 =D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5. =D0=A7=D0=B5=D0=BB=D0=BE=D0=B2=D0=B5=D0=BA =D0=BC=D0=BE=D0=B6=D0=B5=D1=82 = =D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D1=87=D1=8C=D1=81=D1=8F, =D0=BF=D0=BE=D1=82= =D1=80=D0=B0=D1=82=D0=B8=D1=82=D1=8C =D0=B2=D1=80=D0=B5=D0=BC=D1=8F, =D0=BF= =D1=80=D0=BE=D0=B2=D0=B5=D1=81=D1=82=D0=B8 =D1=80=D0=B0=D1=81=D1=81=D0=BB= =D0=B5=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5 =D0=B8 =D0=BF=D0=BE=D0=BF=D1=80=D0=BE=D0=B1=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B4= =D0=BE=D0=B3=D0=B0=D0=B4=D0=B0=D1=82=D1=8C=D1=81=D1=8F, =D1=87=D1=82=D0=BE = =D0=B8=D0=BC=D0=B5=D0=BB=D0=BE=D1=81=D1=8C =D0=B2 =D0=B2=D0=B8=D0=B4=D1=83;= =D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B0 patch =D1=8D=D1=82= =D0=BE=D0=B3=D0=BE =D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C =D0=BD=D0=B5 =D0=B1=D1=83=D0=B4=D0=B5=D1=82 (=D0=B0 git am =E2=80=94 =D0=B8= =D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=BD=D0=BE). =D0=92=D0=BE=D0=B7=D0=BC=D0= =BE=D0=B6=D0=BD=D0=BE, Thunderbird =D0=BB=D0=BE=D0=BC=D0=B0=D0=B5=D1=82 =D0= =BF=D0=B0=D1=82=D1=87=D0=B8 =D0=BF=D1=80=D0=B8 =D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5. =D0=9F=D0=BE=D1=87=D1=82=D0=B0 =D0=B4=D0=BB=D1=8F =D0=BF=D0=B5=D1=80=D0=B5= =D0=BF=D0=B8=D1=81=D0=BA=D0=B8, =D0=BF=D0=BE=D1=87=D1=82=D0=B0 =D0=B4=D0=BB= =D1=8F =D0=BE=D1=84=D0=B8=D1=81=D0=B0/=D1=80=D0=B5=D0=BA=D0=BB=D0=B0=D0=BC= =D1=8B (=D0=B0=D1=83=D1=82=D0=BB=D1=83=D0=BA-=D0=BF=D0=BE=D0=B4=D0=BE=D0=B1= =D0=BD=D0=B0=D1=8F) =D0=B8 =D0=BF=D0=BE=D1=87=D1=82=D0=B0 =D0=B4=D0=BB=D1=8F =D0=BF=D0=B0=D1=82=D1=87=D0=B5=D0=B9 =E2=80=94 =D1=8D=D1= =82=D0=BE =D1=82=D1=80=D0=B8 =D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D0=B5 =D0=BF=D0= =BE=D1=87=D1=82=D1=8B, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5, =D0=BA= =D0=B0=D0=BA =D1=87=D1=83=D0=B4=D0=B5=D1=81=D0=BD=D1=8B=D0=BC =D0=BE=D0=B1= =D1=80=D0=B0=D0=B7=D0=BE=D0=BC =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D0=BB=D0=BE=D1=81=D1=8C, =D0=B8=D1=81= =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1=8E=D1=82 =D0=BD=D0=B5=D0=BA=D0=BE= =D1=82=D0=BE=D1=80=D1=8B=D0=B5 =D0=BE=D0=B1=D1=89=D0=B8=D0=B5 =D1=81=D0=B5= =D1=82=D0=B5=D0=B2=D1=8B=D0=B5 =D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA=D0=BE= =D0=BB=D1=8B =D0=B4=D0=BB=D1=8F =D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0 = =D0=B2 =D1=8F=D1=89=D0=B8=D0=BA =D0=B8 =D0=B4=D0=BB=D1=8F =D0=BF=D0=B5=D1=80=D0=B5= =D1=81=D1=8B=D0=BB=D0=BA=D0=B8. =D0=9D=D0=B0 =D0=BC=D0=BE=D0=B9 =D1=81=D0= =BA=D1=80=D0=BE=D0=BC=D0=BD=D1=8B=D0=B9 =D0=B2=D0=B7=D0=B3=D0=BB=D1=8F=D0= =B4, =D0=BD=D0=B5 =D1=81=D1=82=D0=BE=D0=B8=D1=82 =D0=BF=D1=8B=D1=82=D0=B0= =D1=82=D1=8C=D1=81=D1=8F =D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D1=8B =D0=B4= =D0=BB=D1=8F =D0=BE=D0=B4=D0=BD=D0=BE=D0=B9 =D0=B8=D0=B7 =D1=8D=D1=82=D0=B8= =D1=85 =D0=BF=D0=BE=D1=87=D1=82 =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7= =D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B4=D0=BB=D1=8F =D1=80=D0=B0=D0=B1=D0=BE= =D1=82=D1=8B =D1=81 =D0=B4=D1=80=D1=83=D0=B3=D0=B8=D0=BC=D0=B8 =D0=B4=D0=B2=D1=83=D0=BC=D1=8F. =D0=92 =D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD=D0=BE=D0=B9 =D1=80=D0=B0= =D0=B7 =D0=BF=D0=BE=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D0=B4=D1=83= =D1=8E =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81= =D1=8F git-send-email, =D0=B0 =D0=B5=D1=81=D0=BB=D0=B8 =D0=B5=D0=B3=D0=BE =D1=82=D1=8F=D0=B6=D0=B5=D0=BB=D0=BE =D0=B7=D0=B0=D1=81=D1=82=D0=B0=D0=B2= =D0=B8=D1=82=D1=8C =D0=BF=D0=BE=D1=81=D1=8B=D0=BB=D0=B0=D1=82=D1=8C =D0=BF= =D0=B8=D1=81=D1=8C=D0=BC=D0=B0 =D1=81 GMail-=D1=8F=D1=89=D0=B8=D0=BA=D0=B0 = =E2=80=94 =D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=BF=D0=BE=D0=BF=D1=80=D0=BE=D1= =81=D0=B8=D1=82=D1=8C =D1=83 ldv@/glebfm@ =D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF =D0=BA =D1=81=D0=B5=D1=80= =D0=B2=D0=B5=D1=80=D1=83 @altlinux.org =D0=BF=D0=BE SMTP =D0=B8 =D0=BF=D0= =BE=D1=81=D1=8B=D0=BB=D0=B0=D1=82=D1=8C =D1=81 =D0=B0=D0=B4=D1=80=D0=B5=D1= =81=D0=B0, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9 =D0=B2 =D1=82=D0=BE=D0=BC =D0=B6= =D0=B5 changelog =D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2 =D0=B8=D1=81=D0= =BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D1=82=D1=81=D1=8F. =D0=9F=D0=B8=D1=81=D1=8C=D0=BC=D0=B0 =D0=B2 =D0=B3=D1=83=D0=B3=D0=BB=D0=BE= =D1=8F=D1=89=D0=B8=D0=BA=D0=B5 =D1=82=D0=BE=D0=B6=D0=B5 =D0=BF=D0=BE=D1=8F= =D0=B2=D1=8F=D1=82=D1=81=D1=8F, =D0=B5=D1=81=D0=BB=D0=B8 =D0=B8=D1=85 =D1= =82=D1=83=D0=B4=D0=B0 =D0=BF=D1=80=D0=B8=D1=88=D0=BB=D1=91=D1=82 =D1=80=D0= =B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0 =D0=B8=D0=BB=D0=B8 =D0=B5=D1=81=D0=BB=D0=B8 =D0=BE=D0=BD=D0=B8 =D0=B1=D1=83=D0=B4=D1=83=D1=82 = =D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B =D0=B2 C= c, =D0=B1=D1=83=D0=B4=D1=8C =D1=82=D0=BE =D1=8F=D0=B2=D0=BD=D0=BE =D0=B8=D0= =BB=D0=B8 =D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1= =81=D0=BA=D0=B8. P.S. =D0=9E=D1=87=D0=B5=D0=BD=D1=8C =D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=82=D1= =81=D1=82=D0=B2=D1=83=D1=8E =D1=8D=D1=82=D0=BE =D0=BD=D0=B0=D0=BF=D1=80=D0= =B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 =D0=B8 =D0=B1=D0=BB=D0=B0=D0=B3=D0= =BE=D0=B4=D0=B0=D1=80=D0=B5=D0=BD =D0=B7=D0=B0 =D1=80=D0=B0=D0=B7=D0=B2=D0= =B8=D1=82=D0=B8=D0=B5 pipeline/bootchain! =D0=9E=D1=87=D0=B5=D0=BD=D1=8C =D0=BF=D1=80=D0=B8=D0=B3= =D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F. =D0=9D=D0=B0=D0=B4=D0=BE =D0=B4=D0=BE= =D0=B3=D0=BE=D0=BD=D1=8F=D1=82=D1=8C =D0=B8 =D0=BE=D0=B1=D0=B3=D0=BE=D0=BD= =D1=8F=D1=82=D1=8C =D0=B4=D0=B5=D0=B1=D0=B8=D0=B0=D0=BD ;). >=20 >=20 > Leonid Krivoshein (4): > Separate new feature of bootchain-core from pipeline > kickstart: fix feature to work with bootchain-core > bootchain-core: move bootchain-sh-function to /bin > bootchain: separate getimage and waitdev features >=20 > features/bootchain-core/README.md | 81 +++++++++++++++++++ > features/bootchain-core/config.mk | 5 ++ > .../data/bin/bootchain-sh-functions} | 12 +-- > .../data/etc/initrd/cmdline.d/bootchain-core | 4 + > .../data/etc/rc.d/init.d/bootchain} | 22 +---- > .../data/lib/bootchain}/mountfs | 2 +- > .../data/lib/bootchain}/overlayfs | 2 +- > .../data/lib/bootchain}/rootfs | 2 +- > .../data/lib/initrd/cmdline.d/bootchain | 6 ++ > .../data/lib/initrd/cmdline.d/pipeline | 2 +- > .../data/sbin/bootchained} | 22 ++--- > features/bootchain-core/rules.mk | 3 + > features/bootchain-getimage/README.md | 24 ++++++ > features/bootchain-getimage/config.mk | 5 ++ > .../etc/initrd/cmdline.d/bootchain-getimage | 1 + > .../data/lib/bootchain}/getimage | 2 +- > features/bootchain-getimage/rules.mk | 2 + > features/bootchain-waitdev/README.md | 22 +++++ > features/bootchain-waitdev/config.mk | 6 ++ > .../etc/initrd/cmdline.d/bootchain-waitdev | 1 + > .../udev/rules.d/50-bootchain-waitdev.rules} | 2 +- > .../data/lib/bootchain}/waitdev | 4 +- > .../data/lib/initrd/pre/bootchain/300-waitdev | 12 +++ > .../lib/uevent/filters/bootchain-waitdev} | 4 +- > features/bootchain-waitdev/rules.mk | 2 + > .../lib/{pipeline =3D> bootchain}/kickstart | 2 +- > features/pipeline/config.mk | 9 +-- > .../data/etc/initrd/cmdline.d/pipeline | 5 -- > features/pipeline/rules.mk | 6 -- > 29 files changed, 207 insertions(+), 65 deletions(-) > create mode 100644 features/bootchain-core/README.md > create mode 100644 features/bootchain-core/config.mk > rename features/{pipeline/data/sbin/pipeline-sh-functions =3D> > bootchain-core/data/bin/bootchain-sh-functions} (70%) > create mode 100644 > features/bootchain-core/data/etc/initrd/cmdline.d/bootchain-core > rename features/{pipeline/data/etc/rc.d/init.d/pipeline =3D> > bootchain-core/data/etc/rc.d/init.d/bootchain} (63%) > rename features/{pipeline/data/lib/pipeline =3D> > bootchain-core/data/lib/bootchain}/mountfs (91%) > rename features/{pipeline/data/lib/pipeline =3D> > bootchain-core/data/lib/bootchain}/overlayfs (95%) > rename features/{pipeline/data/lib/pipeline =3D> > bootchain-core/data/lib/bootchain}/rootfs (86%) > create mode 100755 > features/bootchain-core/data/lib/initrd/cmdline.d/bootchain > rename features/{pipeline =3D> > bootchain-core}/data/lib/initrd/cmdline.d/pipeline (64%) > rename features/{pipeline/data/sbin/pipelined =3D> > bootchain-core/data/sbin/bootchained} (78%) > create mode 100644 features/bootchain-core/rules.mk > create mode 100644 features/bootchain-getimage/README.md > create mode 100644 features/bootchain-getimage/config.mk > create mode 100644 > features/bootchain-getimage/data/etc/initrd/cmdline.d/bootchain-getimage > rename features/{pipeline/data/lib/pipeline =3D> > bootchain-getimage/data/lib/bootchain}/getimage (93%) > create mode 100644 features/bootchain-getimage/rules.mk > create mode 100644 features/bootchain-waitdev/README.md > create mode 100644 features/bootchain-waitdev/config.mk > create mode 100644 > features/bootchain-waitdev/data/etc/initrd/cmdline.d/bootchain-waitdev > rename features/{pipeline/data/etc/udev/rules.d/50-pipeline-waitdev.rules > =3D> bootchain-waitdev/data/etc/udev/rules.d/50-bootchain-waitdev.rules} = (77%) > rename features/{pipeline/data/lib/pipeline =3D> > bootchain-waitdev/data/lib/bootchain}/waitdev (83%) > create mode 100755 > features/bootchain-waitdev/data/lib/initrd/pre/bootchain/300-waitdev > rename features/{pipeline/data/lib/uevent/filters/pipeline-waitdev =3D> > bootchain-waitdev/data/lib/uevent/filters/bootchain-waitdev} (77%) > create mode 100644 features/bootchain-waitdev/rules.mk > rename features/kickstart/data/lib/{pipeline =3D> bootchain}/kickstart (= 93%) > delete mode 100644 features/pipeline/data/etc/initrd/cmdline.d/pipeline >=20 > --=20 > 2.24.1 >=20 >=20 > _______________________________________________ > Make-initrd mailing list > Make-initrd@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/make-initrd --n+CN8UXAV6STTqE6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE56JD3UKTLEu/ddrm9dQjyAYL01AFAmFnKmwACgkQ9dQjyAYL 01DMMg//W2zObrgySwlgXC1+S6G+FoWq/0zskOEmc1+TT9kZI6ZR9hqOOMCCeWW1 sCzJO33Z57CuucDmO0SzrRU33urybT6qpGSFFmCjQZaFw9EQK538dw7HbS2VJ6gg DV3lXbMhUTjD8kZt9fxaYERum8J50sGoVl1OfOkNkK7nvCR28HDKHbAFYWP8qbMh MbwT1CR0Bt44ouo4YpEG9s9NGBeMQjtX6wmkkLE/4lbS+csyYDm5/HOlz+Ze4YWJ ugyXWsy+DXnxKXMbwxNcJht8+8SUGjDdhO82+RDBcd3EgxBFE50NDnB7nc6wS4sr qY0xQXUdNNDIvOXKpwcI09BMI1LOvHArzr50KfZex3BMsdciQuD5y4AAzlHxXlte sgNFrs66yQVlCVRIqaIJYSzRagRbIY9hENIiYkAi+1INZghfjmsUW07sQTmFvmS5 swoSn6jWJ9w334mi0WE3Ylq1s3biLFeSM0v7dbOmkFXTlNzIMBe6iRy09iZF6HY1 DuQ7mbApukBc421dH4OPPJiJ/ifFnX8hnf8Kc/9hFBexmgZNR+p/SGytKaUJsfZn 2MVrLAONSJ1Q3+n/kTmxBHzps5bgPONNAK+2vZPbQ5bygiK5l/19b31Tl9/w/S4I 0Z9xrMsbRAIaElmp121UcOh1g7f/HKo2ZkpO/63Cbz9b3OhFF00= =sLiS -----END PGP SIGNATURE----- --n+CN8UXAV6STTqE6--