- Arch-projects - lists.archlinux.org

[arch-projects] [initscripts] Patch to fix FS#24879
by Jacob Okamoto 26 Jun '11

26 Jun '11

Patch to fix FS#24879, clearing terminal text formatting after nonexistent daemon script failure in rc.d. Signed-off-by: Jacob Okamoto <jacobokamoto(a)gmail.com> --- rc.d | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rc.d b/rc.d index 6d9a9f7..58dcfdc 100755 --- a/rc.d +++ b/rc.d @@ -69,8 +69,9 @@ case $1 in if [[ -x "/etc/rc.d/$i" ]]; then env -i "${ENV[@]}" "/etc/rc.d/$i" "$action" else - printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n" + printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist." fi + printf "${C_CLEAR}\n" (( ret += !! $? )) # clamp exit value to 0/1 done ;; -- 1.7.5.2

3 6

[arch-projects] [MKINITCPIO][PATCH 1/5] Add bash completion to mkinitcpio
by Sebastien Luttringer 26 Jun '11

26 Jun '11

It's annoying to remember the name of preset each time Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- Makefile | 1 + bash-completion | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 bash-completion diff --git a/Makefile b/Makefile index b77e088..4068f23 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ install: all install -m644 -t ${DESTDIR}/etc/mkinitcpio.d mkinitcpio.d/* install -m644 mkinitcpio.5 ${DESTDIR}/usr/share/man/man5/mkinitcpio.5 + install -m644 bash-completion ${DESTDIR}/etc/bash_completion.d/mkinitcpio doc: mkinitcpio.5 mkinitcpio.5: mkinitcpio.5.txt diff --git a/bash-completion b/bash-completion new file mode 100644 index 0000000..49cd99e --- /dev/null +++ b/bash-completion @@ -0,0 +1,20 @@ +# mkinitcpio bash completion by Seblu <seblu(a)seblu.net> + +_mkinitcpio () +{ + local action="-c -k -s -b -g -a -p -m -S -v -M -L -H -h" + local cur="${COMP_WORDS[COMP_CWORD]}" + local caction="${COMP_WORDS[COMP_CWORD-1]}" + case "$caction" in + -c|-g|-s|-a) COMPREPLY=($(compgen -f -- $cur));; + -k) COMPREPLY=($(cd /lib/modules && compgen -d -- $cur));; + -b) COMPREPLY=($(compgen -d "$cur" -- $cur));; + -p) COMPREPLY=($(cd /etc/mkinitcpio.d/ && compgen -X '!*.preset' -f -- $cur|sed 's/\.preset//'));; + -H|-S) COMPREPLY=($(cd /lib/initcpio/install/ && compgen -f -- $cur));; + -m) COMPREPLY=();; + *) COMPREPLY=($(compgen -W "${action}" -- "$cur"));; + esac +} +complete -F _mkinitcpio mkinitcpio + +# vim: set ts=2 sw=2 ft=sh noet: -- Sebastien "Seblu" Luttringer

1 4

[arch-projects] [initscripts] [PATCH 00/12] Various minor fixes for consistency mainly
by Kurt J. Bosch 26 Jun '11

26 Jun '11

Kurt J. Bosch (12): Add some more comments mtab, dmesg: show status crypt, lvm: move stat_busy to the top functions: fix indentation fsck_all, kill_everything: Clean up run_hook positions ck_depends, ck_pidfile, do_unlock, kill_everything: add missing local statements Move check on executable fsck into fsck_all() for consistency activate_vgs, fsck_reboot: fix initial return statements for consistecy udevd_modprobe: Get rid of simple if-constuct by using '&&' Get rid of more simple if-constucts by using '&&' and '||' Simplify LC_* unsetting Move export PATH into functions functions | 112 ++++++++++++++++++++++++++++------------------------------ rc.shutdown | 2 - rc.sysinit | 72 +++++++++++++++++--------------------- 3 files changed, 86 insertions(+), 100 deletions(-)

4 30

[arch-projects] [initscripts] [PATCH] rc.sysinit: Fix Initializing Random Seed
by Kurt J. Bosch 26 Jun '11

26 Jun '11

--- rc.sysinit | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index a6a5fa5..2d0fdc1 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -209,7 +209,7 @@ status "Activating Swap" swapon -a RANDOM_SEED=/var/lib/misc/random-seed [[ -f $RANDOM_SEED ]] && status "Initializing Random Seed" \ - cat $RANDOM_SEED > /dev/urandom + eval 'cat $RANDOM_SEED > /dev/urandom' stat_busy "Removing Leftover Files" rm -rf /etc/{nologin,shutdownpid} /forcefsck /tmp/* /tmp/.* &>/dev/null -- 1.7.1

3 4

[arch-projects] [MKINITCPIO][PATCH] Print pretty message if no help is defined in hook
by Sebastien Luttringer 26 Jun '11

26 Jun '11

Thanks to Dave Reisner for having suggested! Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- mkinitcpio | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 6be7fbd..ad330a1 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -120,6 +120,7 @@ while getopts ':c:k:sb:g:p:m:nvH:LMhS:t:z:' arg; do ;; H) [[ ! -r "${INSTDIR}/${OPTARG}" ]] && echo "No such hook: ${OPTARG}" && exit 1 . "${INSTDIR}/${OPTARG}"; + [[ $(type -t help) != function ]] && echo "No help for hook ${OPTARG}" && exit 1 echo "Help for hook '${OPTARG}':" help exit 0 ;; -- Sebastien "Seblu" Luttringer

1 0

Re: [arch-projects] Fwd: [initscripts] [PATCH] Setting Locale: fix status reporting FAIL erroneously
by Kurt J. Bosch 26 Jun '11

26 Jun '11

Dave Reisner, 2011-06-26 19:14: > On Sun, Jun 26, 2011 at 06:59:09PM +0200, Kurt J. Bosch wrote: >> Tom Gundersen, 2011-06-26 17:00: >>> On Sun, Jun 26, 2011 at 4:06 PM, Dave Reisner<d(a)falconindy.com> wrote: >>>> On Sun, Jun 26, 2011 at 03:12:24PM +0200, Kurt J. Bosch wrote: >>>>> Tom Gundersen, 2011-06-26 13:51: >>>>>> On Sun, Jun 26, 2011 at 1:03 PM, Kurt J. Bosch >>>>>> <kjb-temp-2009(a)alpenjodel.de> wrote: >>>>>>> The following test case (run in a terminal) >>>>>>> >>>>>>> #!/bin/bash >>>>>>> >>>>>>> # custom override example >>>>>>> stat_busy() { >>>>>>> if (( PUSH_MSG )); then >>>>>>> # This triggers the error in "$@" below >>>>>>> # actual code was: >>>>>>> # echo set message "$1"> "$spl_fifo"& >>>>>>> :& >>>>>>> fi >>>>>>> echo "$1" BUSY >>>>>>> } >>>>>>> >>>>>>> status() { >>>>>>> stat_busy "$1" >>>>>>> shift >>>>>>> "$@" >>>>>>> local retval=$? >>>>>>> (( retval == 0 ))&& echo DONE || echo FAIL "($retval)" >>>>>>> } >>>>>>> >>>>>>> PUSH_MSG=0 status "test #0" cat<(echo foo) >>>>>>> PUSH_MSG=1 status "test #1" cat<(echo foo) >>>>>> >>>>>> [...] >>>>>> >>>>>>> CCing Tom Gundersen. >>>>>> >>>>>> Thanks. >>>>>> >>>>>> I have not figured it out, but here is a more minimal test: >>>>>> >>>>>> >>>>>> #!/bin/bash >>>>>> >>>>>> >>>>>> test_one() { >>>>>> :& >>>>>> "$@" >>>>>> } >>>>>> >>>>>> test_two() { >>>>>> : >>>>>> "$@" >>>>>> } >>>>>> >>>>>> # working >>>>>> test_one eval 'cat<(echo foo)' >>>>>> test_two cat<(echo foo) >>>>>> >>>>>> #not working >>>>>> test_one cat<(echo foo) >>>>> >>>>> Confirmed. >>>>> >>>>> -- >>>>> Kurt >>>> >>>> Now I see it (at least in Tom's example). It's expected behavior. You're >>>> only allowed to read the file descriptor created by a PE once. However, >>>> because file descriptors are inherited by subshells, when the subshell >>>> ends, the file descriptor is closed and it goes away. Look at what >>>> happens when you modify the script slightly: >>>> >>>> ------------------- >>>> >>>> #!/bin/bash >>>> >>>> test_one() { >>>> ls /dev/fd/ >>>> :& >>>> ls /dev/fd/ >>>> "$@" >>>> } >>>> >>>> test_one cat<(echo foo) >>>> >>>> ------------------- >>>> >>>> And then run it with debug output.... >>>> >>>> +foo[11]: test_one cat /dev/fd/63 >>>> +foo[4]: ls /dev/fd/ >>>> ++foo[11]: echo foo >>>> 0 1 2 3 63 >>>> +foo[6]: ls /dev/fd/ >>>> +foo[5]: : >>>> 0 1 2 3 >>>> +foo[7]: cat /dev/fd/63 >>>> cat: /dev/fd/63: No such file or directory >>>> >>>> The subshell inherits the descriptor and closes it on exit, destroying >>>> it for the parent. The eval "works" because the FD for the process >>>> substitution isn't created until _after_ the subshell. >>>> >>>> Can we _not_ do this? Our old solution didn't require voodoo like this, >>>> and it worked just fine (albeit a few more SLOC). Not everything needs >>>> to be a one line operation. Perhaps we could just write a simple >>>> function to take care of all these 1 line files that we write to: >>>> >>>> write_oneline_file() { >>>> local file=$1 line=$2 mode=$3 >>>> >>>> printf '%s\n' "$line">"$file" >>>> [[ $mode ]]&& chmod "$mode" "$file" >>>> } >>>> >>>> Which satisfies both parties, as it appears to be a one liner in >>>> execution, but it's actually sane on the back end. >>> >>> Thanks for your explanation Dave. I like your solution, should make >>> things more readable. >>> >>> -t >>> >>> [sorry for duplicate, forgot CC] >> >> I would like to go a bit further with this: >> a) Drop the 'oneline' and the '\n' to be able to use it for any >> number of lines including zero. >> b) Allow more options like owner, group, create parent directory. >> >> Maybe like so: >> >> install_file() { >> local file=$1 content=$2 # remaining args go to install directly >> shift 2 >> install -T "$@"<(printf '%s' "$content") "$file" >> } >> >> Then these candidates: >> >> --- rc.sysinit --- >> 221: install -Tm 0664 -o root -g utmp<(:) /var/run/utmp >> 264: install -Tm 0600<( dmesg ) /var/log/dmesg.log >> 266: install -Tm 0644<( dmesg ) /var/log/dmesg.log >> --- rc.shutdown --- >> 24: install -TDm 0600<(:) $RANDOM_SEED >> >> could be turned into: >> >> --- rc.sysinit --- >> 221: install_file /var/run/utmp "" -m 0664 -o root -g utmp >> 264: install_file /var/log/dmesg.log "$( dmesg )" -m 0600 >> 266: install_file /var/log/dmesg.log "$( dmesg )" -m 0644 >> --- rc.shutdown --- >> 24: install_file $RANDOM_SEED "" -m 0600 -D >> >> There is only one small drawback - we would need to add the trailing >> newline explicitly if wanted: >> >> --- rc.sysinit --- >> 232: install_file /etc/profile.d/locale.sh "export >> LANG=$LOCALE"$'\n' -m 0755 >> >> -- >> Kurt > > ACK. I'm good with this. The shell doesn't complain when there's no > trailing newline on the locale file. Is it really necessary? Do we have > a [CZK]SH user who can weigh in? > > d > Don't know, but we add one more line in functions: 504- elif [[ $CONSOLEMAP ]]; then 505: cat <<"EOF" >>/etc/profile.d/locale.sh 506-if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033(K"; fi 507-EOF -- Kurt

1 0

[arch-projects] [MKINITCPIO][PATCH 1/2] Fix printing of bash usage when asking for a bad hook
by Sebastien Luttringer 26 Jun '11

26 Jun '11

before: mkinitcpio -H sex /sbin/mkinitcpio: line 105: /lib/initcpio/install/sex: No such file or directory Help for hook 'sex': GNU bash, version 4.2.10(2)-release (x86_64-unknown-linux-gnu) These shell commands are defined internally. Type `help' to see this list. after: mkinitcpio -H sex No such hook: sex Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- mkinitcpio | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 4082ba5..6be7fbd 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -118,8 +118,9 @@ while getopts ':c:k:sb:g:p:m:nvH:LMhS:t:z:' arg; do IFS=${OLDIFS} unset OLDIFS ;; - H) . "${INSTDIR}/${OPTARG}"; - msg "Help for hook '${OPTARG}'" + H) [[ ! -r "${INSTDIR}/${OPTARG}" ]] && echo "No such hook: ${OPTARG}" && exit 1 + . "${INSTDIR}/${OPTARG}"; + echo "Help for hook '${OPTARG}':" help exit 0 ;; L) msg "Available hooks" -- Sebastien "Seblu" Luttringer

1 1

[arch-projects] Fwd: [initscripts] [PATCH] Setting Locale: fix status reporting FAIL erroneously
by Tom Gundersen 26 Jun '11

26 Jun '11

On Sun, Jun 26, 2011 at 4:06 PM, Dave Reisner <d(a)falconindy.com> wrote: > On Sun, Jun 26, 2011 at 03:12:24PM +0200, Kurt J. Bosch wrote: >> Tom Gundersen, 2011-06-26 13:51: >> >On Sun, Jun 26, 2011 at 1:03 PM, Kurt J. Bosch >> ><kjb-temp-2009(a)alpenjodel.de> wrote: >> >>The following test case (run in a terminal) >> >> >> >>#!/bin/bash >> >> >> >># custom override example >> >>stat_busy() { >> >> if (( PUSH_MSG )); then >> >> # This triggers the error in "$@" below >> >> # actual code was: >> >> # echo set message "$1"> "$spl_fifo"& >> >> :& >> >> fi >> >> echo "$1" BUSY >> >>} >> >> >> >>status() { >> >> stat_busy "$1" >> >> shift >> >> "$@" >> >> local retval=$? >> >> (( retval == 0 ))&& echo DONE || echo FAIL "($retval)" >> >>} >> >> >> >>PUSH_MSG=0 status "test #0" cat<(echo foo) >> >>PUSH_MSG=1 status "test #1" cat<(echo foo) >> > >> >[...] >> > >> >>CCing Tom Gundersen. >> > >> >Thanks. >> > >> >I have not figured it out, but here is a more minimal test: >> > >> > >> >#!/bin/bash >> > >> > >> >test_one() { >> > : & >> > "$@" >> >} >> > >> >test_two() { >> > : >> > "$@" >> >} >> > >> ># working >> >test_one eval 'cat<(echo foo)' >> >test_two cat<(echo foo) >> > >> >#not working >> >test_one cat<(echo foo) >> >> Confirmed. >> >> -- >> Kurt > > Now I see it (at least in Tom's example). It's expected behavior. You're > only allowed to read the file descriptor created by a PE once. However, > because file descriptors are inherited by subshells, when the subshell > ends, the file descriptor is closed and it goes away. Look at what > happens when you modify the script slightly: > > ------------------- > > #!/bin/bash > > test_one() { > ls /dev/fd/ > : & > ls /dev/fd/ > "$@" > } > > test_one cat <(echo foo) > > ------------------- > > And then run it with debug output.... > > +foo[11]: test_one cat /dev/fd/63 > +foo[4]: ls /dev/fd/ > ++foo[11]: echo foo > 0 1 2 3 63 > +foo[6]: ls /dev/fd/ > +foo[5]: : > 0 1 2 3 > +foo[7]: cat /dev/fd/63 > cat: /dev/fd/63: No such file or directory > > The subshell inherits the descriptor and closes it on exit, destroying > it for the parent. The eval "works" because the FD for the process > substitution isn't created until _after_ the subshell. > > Can we _not_ do this? Our old solution didn't require voodoo like this, > and it worked just fine (albeit a few more SLOC). Not everything needs > to be a one line operation. Perhaps we could just write a simple > function to take care of all these 1 line files that we write to: > > write_oneline_file() { > local file=$1 line=$2 mode=$3 > > printf '%s\n' "$line" >"$file" > [[ $mode ]] && chmod "$mode" "$file" > } > > Which satisfies both parties, as it appears to be a one liner in > execution, but it's actually sane on the back end. Thanks for your explanation Dave. I like your solution, should make things more readable. -t [sorry for duplicate, forgot CC]

2 1

[arch-projects] [initscripts] [PATCH 0/2] Some more trivial simplifications
by Kurt J. Bosch 26 Jun '11

26 Jun '11

Kurt J. Bosch (2): Get rid of simple if-constucts by using '&&' Simplify /etc/profile.d/locale.sh creation rc.multi | 4 +--- rc.shutdown | 58 ++++++++++++++++++++++++++-------------------------------- rc.sysinit | 42 ++++++++++++++---------------------------- 3 files changed, 41 insertions(+), 63 deletions(-)

3 9

[arch-projects] [PATCH 0/3] Fixes for master
by Dave Reisner 26 Jun '11

26 Jun '11

One of my commits wasn't merged, which actually breaks the current state of the repo -- or at least the autodetect hook. I foolishly ripped out a variable which I didn't quite grok the full point of. So... it's back in along with some delicious other improvements. Also a fix for the one call to modprobe which doesn't respect $BASEDIR. And along the same lines, proper BASEDIR support _should_ be more or less complete. It needs glorious amounts of testing, of course, so please help out if can. Last patch is at Thomas's request -- it just adds the Makefile itself as a build dep of the man page so that when the VERSION in the Makefile changes, the doc will rebuild itself. Hurray! Thanks again, Thomas, for merging all this. I'm really excited about the next release! Dave Reisner (3): install/autodetect: refactor and simplify hook functions: support $BASEDIR in modprobe Makefile: the Makefile itself is a dep for the manpage Makefile | 2 +- functions | 2 +- install/autodetect | 89 +++++++++++++++----------------------------------- install/filesystems | 25 ++++++-------- 4 files changed, 40 insertions(+), 78 deletions(-) -- 1.7.5.4

1 4