- Arch-projects - lists.archlinux.org

[arch-projects] [RFC2] [PATCH] [initscripts] network: Add missing broadcast address
by Gerardo Exequiel Pozzi 10 Jun '11

10 Jun '11

Without this broadcast address is not set. broadcast= parameter can be empty. In this case the broadcast address is derived by setting all of the interface host bits to one (+). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- network | 2 +- rc.conf | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/network b/network index b8c900d..c2ad9ba 100755 --- a/network +++ b/network @@ -32,7 +32,7 @@ network_up() { return 1 fi done - ip addr add $address/$netmask dev $interface || return 1 + ip addr add $address/$netmask broadcast ${broadcast:-+} dev $interface || return 1 ip route add default via $gateway || return 1 else dhcpcd $DHCPCD_ARGS $interface || return 1 diff --git a/rc.conf b/rc.conf index b9c468a..c17c48c 100644 --- a/rc.conf +++ b/rc.conf @@ -65,12 +65,14 @@ HOSTNAME="myhost" # - interface: name of device (required) # - address: IP address (leave blank for DHCP) # - netmask: subnet mask (ignored for DHCP) +# - broadcast: broadcast address (ignored for DHCP) (optional) # - gateway: default route (ignored for DHCP) # # Static IP example # interface=eth0 # address=192.168.0.2 # netmask=255.255.255.0 +# broadcast=192.168.0.255 # gateway=192.168.0.1 # # DHCP example @@ -82,6 +84,7 @@ HOSTNAME="myhost" interface= address= netmask= +broadcast= gateway= # Setting this to "yes" will skip network shutdown. -- 1.7.5.2

4 6

[arch-projects] [PATCH] added get_pid() and ck_pidfile() (FS#18654)
by Andrwe Lord Weber 10 Jun '11

10 Jun '11

get_pid: Arguments: programname Returns: PID of program ck_pidfile: Arguments: PID-file programname Returns: 0 - PID in PID-file is of program 1 - PID in PID-file is not of program Signed-off-by: Andrwe Lord Weber <archlinux(a)andrwe.org> --- functions | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/functions b/functions index adf4ea9..9a741e1 100644 --- a/functions +++ b/functions @@ -231,6 +231,21 @@ ck_status() { fi } +# Return PID of $1 +get_pid() { + pidof -o %PPID $1 || return 1 +} + +# Check if PID-file $1 is still the active PID-file for command $2 +ck_pidfile() { + if [ -f "$1" ]; then + fpid=$(<"$1") + ppid=$(get_pid $2) + [ $fpid -eq $ppid ] && return 0 + fi + return 1 +} + # PIDs to be omitted by killall5 declare -a omit_pids -- 1.7.5.2

3 4

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.06.3-22-g054e8d3
by tomegun＠archlinux.org 10 Jun '11

10 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 054e8d38fe9e9cf842600fc23d725617ce3611ce (commit) via 3d45a70d3b7e898923638dbb795e50c2e7c378c9 (commit) via f262299928f1aca454a0bbadbcda144b3fb2e7e2 (commit) from 663f5e917994b674d4fbe184ff262f94da11256e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 054e8d38fe9e9cf842600fc23d725617ce3611ce Merge: f262299 3d45a70 Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Jun 10 13:47:50 2011 +0200 Merge remote-tracking branch 'djgera/djgera' commit 3d45a70d3b7e898923638dbb795e50c2e7c378c9 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Jun 9 00:54:02 2011 -0300 [initscripts] network: Add missing broadcast address Without this broadcast address is not set. broadcast= parameter can be empty. In this case the broadcast address is derived by setting all of the interface host bits to one (+). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> commit f262299928f1aca454a0bbadbcda144b3fb2e7e2 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Jun 9 22:59:57 2011 +0200 hostname: echo to kernel directly This allows us to ignore the hostname utility, whose home is currently in flux. Suggested-by: Thomas Bächler <thomas(a)archlinux.org> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: network | 2 +- rc.conf | 3 +++ rc.sysinit | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.06.4 created. 2011.06.4
by tomegun＠archlinux.org 09 Jun '11

09 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The annotated tag, 2011.06.4 has been created at 8215d3a0e555fae1842a8be54be9045d843906b3 (tag) tagging f0717e3fff64817661946f7a2816cfd340450d16 (commit) replaces 2011.06.3 tagged by Tom Gundersen on Fri Jun 10 00:23:48 2011 +0200 - Log ----------------------------------------------------------------- Do not use 'hostname' any longer, this means it can go back to net-tools without us having to care Also fix a trivial syntax error with our printing functions Eric Bélanger (1): Removed superfluous dollar sign Tom Gundersen (1): hostname: echo to kernel directly ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch stable created. 2011.06.4
by tomegun＠archlinux.org 09 Jun '11

09 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, stable has been created at f0717e3fff64817661946f7a2816cfd340450d16 (commit) - Log ----------------------------------------------------------------- commit f0717e3fff64817661946f7a2816cfd340450d16 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Jun 9 22:59:57 2011 +0200 hostname: echo to kernel directly This allows us to ignore the hostname utility, whose home is currently in flux. Suggested-by: Thomas Bächler <thomas(a)archlinux.org> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 366e15271fc8ffd84877822457349a11f56fcecf Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Fri Jun 3 23:06:48 2011 -0400 Removed superfluous dollar sign Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] hostname regression
by Tom Gundersen 09 Jun '11

09 Jun '11

Hi Gaetan, I just thought of this possible solution: "hostname" does not really have to be in core, except for its use in initscripts (correct me if I'm wrong here), so it is ok to keep it in net-tools, and not install net-tools by default (assuming initscripts somehow can set the hostname on boot). If that's correct, we could just install the hostname from coreutil in some place that is not in PATH, such as /lib/initscripts/hostname (without installing the manpage), and keep the old hostname in net-tools. This is similar to what you suggested (putting it in /usr), except that it is a bit more clear: either you have hostname or you don't, you don't have different versions of it depending on what packages are installed. -t

5 11

[arch-projects] [PATCH] [initscripts] network: Add missing broadcast address
by Gerardo Exequiel Pozzi 09 Jun '11

09 Jun '11

Without this broadcast address is not set. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- network | 4 ++-- rc.conf | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/network b/network index b8c900d..06131a2 100755 --- a/network +++ b/network @@ -26,13 +26,13 @@ network_up() { ip link set dev $interface up || return 1 if [[ $address ]]; then - for var in netmask gateway; do + for var in netmask broadcast gateway; do if [[ -z ${!var} ]]; then printf "${C_FAIL}Error: static address defined without $var!\n" return 1 fi done - ip addr add $address/$netmask dev $interface || return 1 + ip addr add $address/$netmask broadcast $broadcast dev $interface || return 1 ip route add default via $gateway || return 1 else dhcpcd $DHCPCD_ARGS $interface || return 1 diff --git a/rc.conf b/rc.conf index b9c468a..36fd4c7 100644 --- a/rc.conf +++ b/rc.conf @@ -65,12 +65,14 @@ HOSTNAME="myhost" # - interface: name of device (required) # - address: IP address (leave blank for DHCP) # - netmask: subnet mask (ignored for DHCP) +# - broadcast: broadcast address (ignored for DHCP) # - gateway: default route (ignored for DHCP) # # Static IP example # interface=eth0 # address=192.168.0.2 # netmask=255.255.255.0 +# broadcast=192.168.0.255 # gateway=192.168.0.1 # # DHCP example @@ -82,6 +84,7 @@ HOSTNAME="myhost" interface= address= netmask= +broadcast= gateway= # Setting this to "yes" will skip network shutdown. -- 1.7.5.2

6 11

Re: [arch-projects] rc.d bash_completion
by Andrwe 09 Jun '11

09 Jun '11

On Thu, 9 Jun 2011 16:55:51 +0200, Seblu wrote: > On Thu, Jun 9, 2011 at 2:43 PM, Dave Reisner <d(a)falconindy.com> > wrote: >> Sorry, I fail to see how keeping things as strings makes things >> _easier_. In my experiences, and as shown here, it leads to complex >> solutions which are not easy to read. I've still yet to sit down and >> really grok what the hell is going on in that regex. >> >> Set subtraction and intersection can be done using grep or comm. I >> prefer grep as it doesn't require the inputs to be sorted. For >> example: >> >> We can do intersection... elements from array1 are matched with >> elements >> from array2. >> >> $ grep -xFf <(printf '%s\n' "${array1[@]}") <(print '%s\n' >> "${array2[@]}") >> >> We can do subtraction... array1 is subtracted from array2. >> >> $ grep -vxFf <(printf '%s\n' "${array1[@]}") <(print '%s\n' >> "${array2[@]}") >> >> And if all else fails, really, what's the problem with using nested >> for loops? It's iteration of small datasets using bash builtins. >> That's >> guaranteed to be fast enough for this. Ok, I understood that point. Didn't know of such a usage of grep + printf. >> I've still got 2 major concerns: >> >> 1) You're parsing Bash which you expect to have a specific form, >> when in >> fact, there is no required format. Someone could easily come along >> and >> create a script which your completion cannot handle. For all this >> added >> complexity, you get functionality which is going to be rarely used. >> I, >> of course, don't have the final say in this, but I really prefer the >> simplicity of our current approach. That said, it does have some >> bugs. I >> encourage you to fix them. Which brings me to point 2... This is a try to fix the most bugs of the current approach by going an other way. If you really think that you can find a fully working initscript which can't be handled by the sed command be my guest. And it already should exist because writing a working script to break something isn't hard. The only scripts I can think of are pushing $1 into a variable an test this one for valid actions: action="${1}" case "${action}" in start) ;; stop) ;; esac (I haven't ever seen this in an initscript) or something like this: if [ "${1}" == "start" ];then ... elif [ "${1}" == "stop" ]; then ... else ... fi Who is writing and using such a chain of if/else in an initscript? All the sed command does is: - removing all lines until "case"-command which tests $1 - removing all lines except the lines which are the patterns of the "case"-command e.g.: start) stop) - removing default choices of the case (*)) - replacing ')' and '|' by space to build a list Indeed that is a heavy combination of sed-commands but it's working properly. Also the main annoyance for the poeple out there is that the completion doesn't work for actions which are script-dependent like ifup or force-reload. The only way to fix it without using a may-not-work-in-this-and-that-never-seen-condition-command is to add all actions which are and will be in the initscripts. This is IMO unrelyable and can't be handled by anyone. But if you insist in using the current approach I'll try and fix existing bugs. >> 2) This is still a code dump, and as such, I don't think anyone will >> accept this regardless of how good or bad it is. You've created a >> diff >> of your script versus what we currently have in git (and not the >> official git). We accept properly formed patches (that means commit >> messages) sent with git-send-email. Alternatively, I know Tom is a >> fan >> of pull requests from remote branches, such as my initscripts or >> mkinitcpio repos on Github. > > Functionnality is useful, but i agree on two points. I didn't know how you want to get patches. It's the first time I try to sent a patch to arch-dev-list. Does all people have write-access to your git? Or how should I commit a modification so you'll get an email? I mean if I just clone your git and commit it to my clone you'll never get a notification. Is there maybe a wiki-article describing the way how you want to get patches? Kind regards, Andrwe

2 1

[arch-projects] rc.d bash_completion
by Andrwe 09 Jun '11

09 Jun '11

Hi, I've improved the bash-completion of rc.d. I created a patch for latest git (https://github.com/seblu/arch-initscripts/tree/) The patched version extracts all actions of an initscript and adds them to the list of possible actions and only list initscripts supporting the given action. Kind regards, Andrwe

3 4

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.06.3-19-g663f5e9
by tomegun＠archlinux.org 07 Jun '11

07 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 663f5e917994b674d4fbe184ff262f94da11256e (commit) via 32047175759770ac0b37a1fede68a13e2b4d4fdd (commit) via 49932857b8bc41c2e494bea1ee278fffa724519d (commit) via d0b7d600da518778b2a5d7c08785ea328fbaf2e7 (commit) from 3ac781f2f188b4e9c698aba7ede6154a64ffc679 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 663f5e917994b674d4fbe184ff262f94da11256e Merge: 3ac781f 3204717 Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Jun 8 01:11:37 2011 +0200 Merge branch 'snowman' Conflicts: rc.multi rc.single Trivial conflict, and fixed a bug introduced when I imported the patches in the first place (oops). Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 32047175759770ac0b37a1fede68a13e2b4d4fdd Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Fri Jun 3 23:18:50 2011 -0400 Add logrotate config file to rotate /var/log/boot Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 49932857b8bc41c2e494bea1ee278fffa724519d Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Fri Jun 3 23:06:48 2011 -0400 Removed superfluous dollar sign Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit d0b7d600da518778b2a5d7c08785ea328fbaf2e7 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Jun 5 23:23:57 2011 -0400 Clean up ANSI codes from /var/log/boot Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 3 ++- bootlog | 9 +++++++++ functions | 2 +- rc.multi | 6 ++++-- rc.single | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 bootlog hooks/post-receive -- Arch Linux initscripts repository

1 0