[arch-releng] AIF [PATCH 2/2] Already running dhcpcd is not stopped during network setup - Arch-releng - lists.archlinux.org

newer
Re: [arch-releng] AIF [PATCH 1/2]...

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

older
[arch-releng] AIF [PATCH 1/2] Fix...

Gerhard Brauer

1 Mar 2009 1 Mar '09

8:05 p.m.

If network is already set up during ftp install (dhcpcd already running and $INTERFACE is running) aif failed when stopping and reconfigure during interactive network setup. Reason: we kill a process named dhcpd, but it must be dhcpcd. So no running dhcp client is stopped and the network setup failed cause already a client running on $INTERFACE. So we have to kill: kill dhcpcd. Or better use the dhcpcd function fur such a case: dhcpcd -k $INTERFACE. Regards Gerhard

Show replies by thread

Gerhard Brauer

1 Mar 1 Mar

8:36 p.m.

Patch, this time inline: ---------------

From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer 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 --- 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 -- 1.6.1.3

Dieter Plaetinck

2 Mar 2 Mar

8:04 p.m.

On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

Patch, this time inline: ---------------

...
From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer 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 --- 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

Allan McRae

8:24 p.m.

Dieter Plaetinck wrote:

On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

...
Patch, this time inline: ---------------

...
From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00

...
2001

From: Gerhard Brauer 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 --- 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

Dieter Plaetinck

8:40 p.m.

On Tue, 03 Mar 2009 06:24:45 +1000 Allan McRae wrote:

Dieter Plaetinck wrote:

...
On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

...
Patch, this time inline: ---------------

...
From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00

...
2001

From: Gerhard Brauer 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 --- 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. o_O Dieter

Dan McGee

3 Mar 3 Mar

1:51 a.m.

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

On Mon, Mar 2, 2009 at 2:40 PM, Dieter Plaetinck wrote:

On Tue, 03 Mar 2009 06:24:45 +1000 Allan McRae wrote:

...
Dieter Plaetinck wrote:

...
On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

...
Patch, this time inline: ---------------

...
From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00

...
2001

From: Gerhard Brauer 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 --- 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

Dieter Plaetinck

5 Mar 5 Mar

7:17 p.m.

On Mon, 2 Mar 2009 19:51:32 -0600 Dan McGee wrote:

On Mon, Mar 2, 2009 at 2:40 PM, Dieter Plaetinck wrote:

...
On Tue, 03 Mar 2009 06:24:45 +1000 Allan McRae wrote:

...
Dieter Plaetinck wrote:

...
On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

...
Patch, this time inline: ---------------

...
From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 00:00:00

...
2001

From: Gerhard Brauer 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 --- 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

Unfortunately, that's not it. Cleaned up my workspace and the issue remained. Any more ideas? Dieter

Aaron Griffin

6 Mar 6 Mar

9:30 p.m.

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

On Thu, Mar 5, 2009 at 1:17 PM, Dieter Plaetinck wrote:

On Mon, 2 Mar 2009 19:51:32 -0600 Dan McGee wrote:

...
On Mon, Mar 2, 2009 at 2:40 PM, Dieter Plaetinck wrote:

...
On Tue, 03 Mar 2009 06:24:45 +1000 Allan McRae wrote:

...
Dieter Plaetinck wrote:

...
On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

...
Patch, this time inline: ---------------

>From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 >00:00:00

> 2001 > From: Gerhard Brauer 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 --- 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

Unfortunately, that's not it. Cleaned up my workspace and the issue remained. Any more ideas?

Delete the file it yells about? Do you still need "git am -s < file" like you used to? I always use it with the < anyway

Aaron Griffin

9:31 p.m.

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

On Fri, Mar 6, 2009 at 3:30 PM, Aaron Griffin wrote:

On Thu, Mar 5, 2009 at 1:17 PM, Dieter Plaetinck wrote:

...
On Mon, 2 Mar 2009 19:51:32 -0600 Dan McGee wrote:

...
On Mon, Mar 2, 2009 at 2:40 PM, Dieter Plaetinck wrote:

...
On Tue, 03 Mar 2009 06:24:45 +1000 Allan McRae wrote:

...
Dieter Plaetinck wrote:

...
On Sun, 01 Mar 2009 21:36:35 +0100 Gerhard Brauer wrote:

> Patch, this time inline: > --------------- > > >From 550190719d6c62e55da5946f68253deb3ca28799 Mon Sep 17 > >00:00:00 > >> 2001 >> > From: Gerhard Brauer > 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 > --- > 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

Unfortunately, that's not it. Cleaned up my workspace and the issue remained. Any more ideas?

Delete the file it yells about? Do you still need "git am -s < file" like you used to? I always use it with the < anyway

And if you really want to, just make the changes manually and then run git add <file> git commit -s --author="Gerhard Brauer " # enter the text from Gerhard's patch

5531

Age (days ago)

5536

Last active (days ago)

Download

8 comments

5 participants

tags

participants (5)

Aaron Griffin
Allan McRae
Dan McGee
Dieter Plaetinck
Gerhard Brauer