* Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace
@ 2021-10-26 9:20 ` Alexey Gladkov
2021-10-26 9:51 ` Leonid Krivoshein
0 siblings, 1 reply; 4+ messages in thread
From: Alexey Gladkov @ 2021-10-26 9:20 UTC (permalink / raw)
To: make-initrd
On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
> Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
> ---
> .../data/bin/bootchain-sh-functions | 28 +++++++++++--------
> features/bootchain-core/data/sbin/chaind | 6 ++--
> .../data/lib/bootchain/waitdev | 1 +
> 3 files changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
> index fa6201f..f337767 100644
> --- a/features/bootchain-core/data/bin/bootchain-sh-functions
> +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
> @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
> handlerdir=/lib/bootchain
> [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
>
> +
> check_parameter()
> {
> local v
> +
> eval "v=\"\${$1-}\""
> [ -n "$v" ] ||
> fatal "Parameter '$1' required"
> @@ -25,20 +27,22 @@ get_parameter()
> resolve_target()
> {
> local target="$1"
> +
> case "${target%%/*}" in
> - '')
> - ;;
> - pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> - target="$mntdir/dst/step${target:4}"
> - ;;
> - *)
> - if [ -z "${prevdir-}" ]; then
> - message "no previous stop to use"
> - return
> - fi
> - target="$prevdir/${target#/}"
> - ;;
> + '')
> + ;;
> + pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> + target="$mntdir/dst/step${target:4}"
> + ;;
> + *)
> + if [ -z "${prevdir-}" ]; then
> + message "no previous stop to use"
> + return
> + fi
> + target="$prevdir/${target#/}"
> + ;;
Это неправильное форматирование. Остальной код отформатирован иначе:
git grep -A1 'case "' features/
> esac
> +
> printf '%s' "$target"
> }
>
> diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
> index d401101..08e5e58 100755
> --- a/features/bootchain-core/data/sbin/chaind
> +++ b/features/bootchain-core/data/sbin/chaind
> @@ -7,6 +7,7 @@ message_time=1
> pidfile="/var/run/$PROG.pid"
> logfile="/var/log/$PROG.log"
>
> +
> exit_handler()
> {
> local rc="$?"
> @@ -15,6 +16,7 @@ exit_handler()
> exit $rc
> }
>
> +
> [ ! -f "$pidfile" ] ||
> fatal "already running"
>
> @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
>
> export name callnum datadir destdir prevdir
>
> - rc=0
> - "$exe" || rc=$?
> + rc=0
> + "$exe" || rc=$?
А это вообще ошибка в форматировании.
>
> if [ "$rc" != 0 ]; then
> [ "$rc" != 2 ] ||
> diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> index 74af6ea..bc81673 100755
> --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
> +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
> break
> fi
> fi
> +
> sleep 1
> done
> --
> 2.24.1
>
> _______________________________________________
> Make-initrd mailing list
> Make-initrd@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/make-initrd
>
--
Rgrds, legion
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace
2021-10-26 9:20 ` [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace Alexey Gladkov
@ 2021-10-26 9:51 ` Leonid Krivoshein
2021-10-26 11:14 ` Alexey Gladkov
0 siblings, 1 reply; 4+ messages in thread
From: Leonid Krivoshein @ 2021-10-26 9:51 UTC (permalink / raw)
To: make-initrd
26.10.2021 12:20, Alexey Gladkov пишет:
> On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
>> Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
>> ---
>> .../data/bin/bootchain-sh-functions | 28 +++++++++++--------
>> features/bootchain-core/data/sbin/chaind | 6 ++--
>> .../data/lib/bootchain/waitdev | 1 +
>> 3 files changed, 21 insertions(+), 14 deletions(-)
>>
>> diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
>> index fa6201f..f337767 100644
>> --- a/features/bootchain-core/data/bin/bootchain-sh-functions
>> +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
>> @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
>> handlerdir=/lib/bootchain
>> [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
>>
>> +
>> check_parameter()
>> {
>> local v
>> +
>> eval "v=\"\${$1-}\""
>> [ -n "$v" ] ||
>> fatal "Parameter '$1' required"
>> @@ -25,20 +27,22 @@ get_parameter()
>> resolve_target()
>> {
>> local target="$1"
>> +
>> case "${target%%/*}" in
>> - '')
>> - ;;
>> - pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
>> - target="$mntdir/dst/step${target:4}"
>> - ;;
>> - *)
>> - if [ -z "${prevdir-}" ]; then
>> - message "no previous stop to use"
>> - return
>> - fi
>> - target="$prevdir/${target#/}"
>> - ;;
>> + '')
>> + ;;
>> + pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
>> + target="$mntdir/dst/step${target:4}"
>> + ;;
>> + *)
>> + if [ -z "${prevdir-}" ]; then
>> + message "no previous stop to use"
>> + return
>> + fi
>> + target="$prevdir/${target#/}"
>> + ;;
> Это неправильное форматирование. Остальной код отформатирован иначе:
>
> git grep -A1 'case "' features/
Понял, это я прощёлкал. Переделаю.
>
>> esac
>> +
>> printf '%s' "$target"
>> }
>>
>> diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
>> index d401101..08e5e58 100755
>> --- a/features/bootchain-core/data/sbin/chaind
>> +++ b/features/bootchain-core/data/sbin/chaind
>> @@ -7,6 +7,7 @@ message_time=1
>> pidfile="/var/run/$PROG.pid"
>> logfile="/var/log/$PROG.log"
>>
>> +
>> exit_handler()
>> {
>> local rc="$?"
>> @@ -15,6 +16,7 @@ exit_handler()
>> exit $rc
>> }
>>
>> +
>> [ ! -f "$pidfile" ] ||
>> fatal "already running"
>>
>> @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
>>
>> export name callnum datadir destdir prevdir
>>
>> - rc=0
>> - "$exe" || rc=$?
>> + rc=0
>> + "$exe" || rc=$?
> А это вообще ошибка в форматировании.
Переделаю. Да, здесь whitespace слишком преждевременно (#05->16) для
уменьшения diff. Вопрос в том, как лучше переделать? Сделать отдельный
коммит whitespace перед коммитом, где тут ожидается изменение (#16), или
чёрт с ним, со сдвигом? Просто удалятся и добавятся две строки, по diff
и так будет понятно, что это старый код.
>> if [ "$rc" != 0 ]; then
>> [ "$rc" != 2 ] ||
>> diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
>> index 74af6ea..bc81673 100755
>> --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
>> +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
>> @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
>> break
>> fi
>> fi
>> +
>> sleep 1
>> done
>> --
>> 2.24.1
>>
>> _______________________________________________
>> Make-initrd mailing list
>> Make-initrd@lists.altlinux.org
>> https://lists.altlinux.org/mailman/listinfo/make-initrd
>>
--
Best regards,
Leonid Krivoshein.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace
2021-10-26 9:51 ` Leonid Krivoshein
@ 2021-10-26 11:14 ` Alexey Gladkov
2021-10-26 17:31 ` Leonid Krivoshein
0 siblings, 1 reply; 4+ messages in thread
From: Alexey Gladkov @ 2021-10-26 11:14 UTC (permalink / raw)
To: make-initrd
On Tue, Oct 26, 2021 at 12:51:14PM +0300, Leonid Krivoshein wrote:
>
> 26.10.2021 12:20, Alexey Gladkov пишет:
> > On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
> > > Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
> > > ---
> > > .../data/bin/bootchain-sh-functions | 28 +++++++++++--------
> > > features/bootchain-core/data/sbin/chaind | 6 ++--
> > > .../data/lib/bootchain/waitdev | 1 +
> > > 3 files changed, 21 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
> > > index fa6201f..f337767 100644
> > > --- a/features/bootchain-core/data/bin/bootchain-sh-functions
> > > +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
> > > @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
> > > handlerdir=/lib/bootchain
> > > [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
> > > +
> > > check_parameter()
> > > {
> > > local v
> > > +
> > > eval "v=\"\${$1-}\""
> > > [ -n "$v" ] ||
> > > fatal "Parameter '$1' required"
> > > @@ -25,20 +27,22 @@ get_parameter()
> > > resolve_target()
> > > {
> > > local target="$1"
> > > +
> > > case "${target%%/*}" in
> > > - '')
> > > - ;;
> > > - pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> > > - target="$mntdir/dst/step${target:4}"
> > > - ;;
> > > - *)
> > > - if [ -z "${prevdir-}" ]; then
> > > - message "no previous stop to use"
> > > - return
> > > - fi
> > > - target="$prevdir/${target#/}"
> > > - ;;
> > > + '')
> > > + ;;
> > > + pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
> > > + target="$mntdir/dst/step${target:4}"
> > > + ;;
> > > + *)
> > > + if [ -z "${prevdir-}" ]; then
> > > + message "no previous stop to use"
> > > + return
> > > + fi
> > > + target="$prevdir/${target#/}"
> > > + ;;
> > Это неправильное форматирование. Остальной код отформатирован иначе:
> >
> > git grep -A1 'case "' features/
>
> Понял, это я прощёлкал. Переделаю.
>
>
> >
> > > esac
> > > +
> > > printf '%s' "$target"
> > > }
> > > diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
> > > index d401101..08e5e58 100755
> > > --- a/features/bootchain-core/data/sbin/chaind
> > > +++ b/features/bootchain-core/data/sbin/chaind
> > > @@ -7,6 +7,7 @@ message_time=1
> > > pidfile="/var/run/$PROG.pid"
> > > logfile="/var/log/$PROG.log"
> > > +
> > > exit_handler()
> > > {
> > > local rc="$?"
> > > @@ -15,6 +16,7 @@ exit_handler()
> > > exit $rc
> > > }
> > > +
> > > [ ! -f "$pidfile" ] ||
> > > fatal "already running"
> > > @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
> > > export name callnum datadir destdir prevdir
> > > - rc=0
> > > - "$exe" || rc=$?
> > > + rc=0
> > > + "$exe" || rc=$?
> > А это вообще ошибка в форматировании.
>
> Переделаю. Да, здесь whitespace слишком преждевременно (#05->16) для
> уменьшения diff. Вопрос в том, как лучше переделать? Сделать отдельный
> коммит whitespace перед коммитом, где тут ожидается изменение (#16), или
> чёрт с ним, со сдвигом? Просто удалятся и добавятся две строки, по diff и
> так будет понятно, что это старый код.
Оставь пока так. Просто в следующей версии выкини этот коммит.
>
> > > if [ "$rc" != 0 ]; then
> > > [ "$rc" != 2 ] ||
> > > diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > index 74af6ea..bc81673 100755
> > > --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
> > > @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
> > > break
> > > fi
> > > fi
> > > +
> > > sleep 1
> > > done
> > > --
> > > 2.24.1
> > >
> > > _______________________________________________
> > > Make-initrd mailing list
> > > Make-initrd@lists.altlinux.org
> > > https://lists.altlinux.org/mailman/listinfo/make-initrd
> > >
>
> --
> Best regards,
> Leonid Krivoshein.
>
> _______________________________________________
> Make-initrd mailing list
> Make-initrd@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/make-initrd
--
Rgrds, legion
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace
2021-10-26 11:14 ` Alexey Gladkov
@ 2021-10-26 17:31 ` Leonid Krivoshein
0 siblings, 0 replies; 4+ messages in thread
From: Leonid Krivoshein @ 2021-10-26 17:31 UTC (permalink / raw)
To: make-initrd
26.10.2021 14:14, Alexey Gladkov пишет:
> On Tue, Oct 26, 2021 at 12:51:14PM +0300, Leonid Krivoshein wrote:
>> 26.10.2021 12:20, Alexey Gladkov пишет:
>>> On Sun, Oct 24, 2021 at 08:20:39PM +0300, Leonid Krivoshein wrote:
>>>> Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
>>>> ---
>>>> .../data/bin/bootchain-sh-functions | 28 +++++++++++--------
>>>> features/bootchain-core/data/sbin/chaind | 6 ++--
>>>> .../data/lib/bootchain/waitdev | 1 +
>>>> 3 files changed, 21 insertions(+), 14 deletions(-)
>>>>
>>>> diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
>>>> index fa6201f..f337767 100644
>>>> --- a/features/bootchain-core/data/bin/bootchain-sh-functions
>>>> +++ b/features/bootchain-core/data/bin/bootchain-sh-functions
>>>> @@ -9,9 +9,11 @@ __bootchain_sh_functions=1
>>>> handlerdir=/lib/bootchain
>>>> [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
>>>> +
>>>> check_parameter()
>>>> {
>>>> local v
>>>> +
>>>> eval "v=\"\${$1-}\""
>>>> [ -n "$v" ] ||
>>>> fatal "Parameter '$1' required"
>>>> @@ -25,20 +27,22 @@ get_parameter()
>>>> resolve_target()
>>>> {
>>>> local target="$1"
>>>> +
>>>> case "${target%%/*}" in
>>>> - '')
>>>> - ;;
>>>> - pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
>>>> - target="$mntdir/dst/step${target:4}"
>>>> - ;;
>>>> - *)
>>>> - if [ -z "${prevdir-}" ]; then
>>>> - message "no previous stop to use"
>>>> - return
>>>> - fi
>>>> - target="$prevdir/${target#/}"
>>>> - ;;
>>>> + '')
>>>> + ;;
>>>> + pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
>>>> + target="$mntdir/dst/step${target:4}"
>>>> + ;;
>>>> + *)
>>>> + if [ -z "${prevdir-}" ]; then
>>>> + message "no previous stop to use"
>>>> + return
>>>> + fi
>>>> + target="$prevdir/${target#/}"
>>>> + ;;
>>> Это неправильное форматирование. Остальной код отформатирован иначе:
>>>
>>> git grep -A1 'case "' features/
>> Понял, это я прощёлкал. Переделаю.
>>
>>
>>>> esac
>>>> +
>>>> printf '%s' "$target"
>>>> }
>>>> diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
>>>> index d401101..08e5e58 100755
>>>> --- a/features/bootchain-core/data/sbin/chaind
>>>> +++ b/features/bootchain-core/data/sbin/chaind
>>>> @@ -7,6 +7,7 @@ message_time=1
>>>> pidfile="/var/run/$PROG.pid"
>>>> logfile="/var/log/$PROG.log"
>>>> +
>>>> exit_handler()
>>>> {
>>>> local rc="$?"
>>>> @@ -15,6 +16,7 @@ exit_handler()
>>>> exit $rc
>>>> }
>>>> +
>>>> [ ! -f "$pidfile" ] ||
>>>> fatal "already running"
>>>> @@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
>>>> export name callnum datadir destdir prevdir
>>>> - rc=0
>>>> - "$exe" || rc=$?
>>>> + rc=0
>>>> + "$exe" || rc=$?
>>> А это вообще ошибка в форматировании.
>> Переделаю. Да, здесь whitespace слишком преждевременно (#05->16) для
>> уменьшения diff. Вопрос в том, как лучше переделать? Сделать отдельный
>> коммит whitespace перед коммитом, где тут ожидается изменение (#16), или
>> чёрт с ним, со сдвигом? Просто удалятся и добавятся две строки, по diff и
>> так будет понятно, что это старый код.
> Оставь пока так. Просто в следующей версии выкини этот коммит.
OK
>>>> if [ "$rc" != 0 ]; then
>>>> [ "$rc" != 2 ] ||
>>>> diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
>>>> index 74af6ea..bc81673 100755
>>>> --- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
>>>> +++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
>>>> @@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
>>>> break
>>>> fi
>>>> fi
>>>> +
>>>> sleep 1
>>>> done
>>>> --
>>>> 2.24.1
>>>>
>>>> _______________________________________________
>>>> Make-initrd mailing list
>>>> Make-initrd@lists.altlinux.org
>>>> https://lists.altlinux.org/mailman/listinfo/make-initrd
>>>>
>> --
>> Best regards,
>> Leonid Krivoshein.
>>
>> _______________________________________________
>> Make-initrd mailing list
>> Make-initrd@lists.altlinux.org
>> https://lists.altlinux.org/mailman/listinfo/make-initrd
--
Best regards,
Leonid Krivoshein.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-26 17:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 9:20 ` [make-initrd] [PATCH v6 05/22] bootchain-core, bootchain-waitdev: whitespace Alexey Gladkov
2021-10-26 9:51 ` Leonid Krivoshein
2021-10-26 11:14 ` Alexey Gladkov
2021-10-26 17:31 ` Leonid Krivoshein
Make-initrd development discussion
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \
make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com
public-inbox-index make-initrd
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.make-initrd
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git