[arch-releng] AIF [PATCH 2/2] Already running dhcpcd is not stopped during network setup

[Dan McGee]

On Mon, Mar 2, 2009 at 2:40 PM, Dieter Plaetinck <dieter at plaetinck.be> wrote:
> On Tue, 03 Mar 2009 06:24:45 +1000
> Allan McRae <allan at archlinux.org> wrote:
>
>> Dieter Plaetinck wrote:
>> > On Sun, 01 Mar 2009 21:36:35 +0100
>> > Gerhard Brauer <gerbra at archlinux.de> wrote:
>> >
>> >
>> >> Patch, this time inline:
>> >> ---------------
>> >>
>> >> >From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00
>> >>
>> >>> 2001
>> >>>
>> >> From: Gerhard Brauer <gerbra at archlinux.de>
>> >> Date: Sun, 1 Mar 2009 20:34:42 +0100
>> >> Subject: [PATCH 2/2] Already running dhcpcd is not stopped during
>> >> network setup
>> >>
>> >> We kill a process named dhcpd, but it must be dhcpcd. But instead
>> >> of killing the process it's better to use the dhcpcd own method to
>> >> stop an already running dhcp cleint for the selected interface.
>> >>
>> >> Signed-off-by: Gerhard Brauer <gerbra at archlinux.de>
>> >> ---
>> >>  src/core/libs/lib-ui-interactive.sh |    3 +--
>> >>  1 files changed, 1 insertions(+), 2 deletions(-)
>> >>
>> >> diff --git a/src/core/libs/lib-ui-interactive.sh
>> >> b/src/core/libs/lib-ui-interactive.sh
>> >> index 8fdc5dc..5a34117 100644
>> >> --- a/src/core/libs/lib-ui-interactive.sh
>> >> +++ b/src/core/libs/lib-ui-interactive.sh
>> >> @@ -633,8 +633,7 @@ interactive_runtime_network() {
>> >>      ask_yesno "Do you want to use DHCP?"
>> >>      if [ $? -eq 0 ]; then
>> >>          infofy "Please wait.  Polling for DHCP server on
>> >> $INTERFACE..."
>> >> -        killall dhcpd
>> >> -        killall -9 dhcpd
>> >> +  dhcpcd -k $INTERFACE >$LOG 2>&1
>> >>          sleep 1
>> >>          dhcpcd $INTERFACE >$LOG 2>&1
>> >>          if [ $? -ne 0 ]; then
>> >>
>> >
>> >
>> > How should I apply this?
>> > My current approach:
>> > copy patch from mail
>> > paste into text file.
>> > type git-apply <text file>
>> > that leaves me with Gerhards changes in the index&working tree.
>> > If I commit that, I have to specify a commit message, and the commit
>> > will have my name and email adress as author. Is this correct?
>> > Isn't it supposted to be Gerhards name and email to show up in the
>> > git log after the commit? (eg like here
>> > http://projects.archlinux.org/?p=installer.git )
>> >
>> > Dieter
>> >
>>
>> Just save the email, then "git am -s <file>" should work.
>>
>> Allan
>>
> Thanks, but:
> $ git am -s /home/dieter/gerhardmail
> previous rebase
> directory /home/dieter/workspaces/eclipse/aif/.git/rebase-apply still
> exists but mbox given.

You really have to keep better track of your current state. I assume
'git status' shows you that; I just have it in my bash prompt. :P

'git rebase --abort' should get you out of that mess, although be
careful- you might lose local work if you are not in a good clean
state, but it seems you have already landed yourself there.

-Dan