- Arch-projects - lists.archlinux.org

[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

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

25 Jun '11

Dave Reisner, 2011-06-25 16:27: > On Sat, Jun 25, 2011 at 03:38:52PM +0200, Kurt J. Bosch wrote: >> Dave Reisner, 2011-06-25 15:27: >>> On Sat, Jun 25, 2011 at 03:17:40PM +0200, Kurt J. Bosch wrote: >>>> From: "Kurt J. Bosch"<kjb-temp-2009(a)alpenjodel.de> >>>> >>>> --- >>>> rc.sysinit | 2 +- >>>> 1 files changed, 1 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/rc.sysinit b/rc.sysinit >>>> index 4073fb9..75f8095 100755 >>>> --- a/rc.sysinit >>>> +++ b/rc.sysinit >>>> @@ -229,7 +229,7 @@ stat_done >>>> >>>> # Flush old locale settings and set user defined locale >>>> status "Setting Locale: ${LOCALE:=en_US}" \ >>>> - install -Tm 0755<(echo "export LANG=$LOCALE") /etc/profile.d/locale.sh >>>> + eval 'install -Tm 0755<(echo "export LANG=$LOCALE") /etc/profile.d/locale.sh' >>>> >>>> if [[ ${LOCALE,,} =~ utf ]]; then >>>> stat_busy "Setting Consoles to UTF-8 mode" >>>> -- >>>> 1.7.5.2 >>>> >>> >>> NACK. >>> >>> As far as I can tell, the eval is not at all necessary. >>> >>> dave >>> >> Yes, that's a bit strange. When trying in a terminal it works >> without, but when actually booting it doesn't. Maybe some BASH bug? >> -- >> Kurt > > Works for me. More likely, the problem is the missing whitespace between > 0755 and the process substitution. No idea why the eval 'fixes' that, > though. Actually the whitespace *is* there, it just disappeared in this thread. > > I wouldn't be too keen on cleaning up the locale stuff anyways -- it > needs a proper fix. Setting the locale as part of an /etc/profile.d is > the wrong thing to do. > > d So maybe this code should be dropped and locale.sh or some other config file should be set up manually? This way rc.conf would only be responsible for things affecting sysinit and daemons, but we would also need something to get rid of the CONSOLEMAP hack in set_consolefont(). -- Kurt

3 2

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.6.15-46-g18eb47e
by thomas＠archlinux.org 25 Jun '11

25 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 "The official mkinitcpio repository". The branch, master has been updated via 18eb47e46e0630638011e05cd549ec5d8e0bf490 (commit) from ead707165e3b084b814ae924e6d206720f414031 (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 18eb47e46e0630638011e05cd549ec5d8e0bf490 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Sat Jun 25 13:34:07 2011 -0300 Fix some install hooks due recent change in all_modules() [fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> ----------------------------------------------------------------------- Summary of changes: install/fw | 2 +- install/pcmcia | 2 +- install/usb | 2 +- install/usbinput | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [PATCH] [mkinitcpio] Fix some install hooks due recent change in all_modules()
by Gerardo Exequiel Pozzi 25 Jun '11

25 Jun '11

[fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- install/fw | 2 +- install/pcmcia | 2 +- install/usb | 2 +- install/usbinput | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/fw b/install/fw index 9f4ed26..67355a5 100644 --- a/install/fw +++ b/install/fw @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/firewire/") " + MODULES=" $(checked_modules '/drivers/firewire/') " MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/pcmcia b/install/pcmcia index 8b685c5..105b92b 100644 --- a/install/pcmcia +++ b/install/pcmcia @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules '/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" + MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then MODULES="${MODULES} sd_mod" diff --git a/install/usb b/install/usb index 605912c..1a30a53 100644 --- a/install/usb +++ b/install/usb @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")" + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/usbinput b/install/usbinput index 0d293ae..4f46979 100644 --- a/install/usbinput +++ b/install/usbinput @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd") " + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd") " MODULES=" $(echo ${MODULES}) $(all_modules "/hid/hid-") " MODULES=$(echo ${MODULES}) #trim whitespace -- 1.7.5.2

2 2

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.6.15-45-gead7071
by thomas＠archlinux.org 25 Jun '11

25 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 "The official mkinitcpio repository". The branch, master has been updated via ead707165e3b084b814ae924e6d206720f414031 (commit) via 840893e2b37470749d11e249becdba40b91adc92 (commit) via 99c2b87cdbc3f449b68ed6d0bf2fec624d539972 (commit) via 733afaaa9c52e55d047d5e6a5d689131e1fde3e6 (commit) via 8ca2543c17819e754d2ebf467acfc65a636d25f2 (commit) via bb2b9737a8343a1a3bb87a15ffb605ce8ff2af70 (commit) via 71f3c2b390e3359c18ad3552ce3ece142937f034 (commit) via 8812e6e99e1b3e0c235a5e132f43d7decda312ad (commit) via 3aedc3b1b6dd4e56c74626a15fa00253f9b07716 (commit) via 18ba64b65a1d24c7d37e4ddab5c12668e0e097df (commit) via 199eea97bad60365dcfd5bac7ea55fc39b2f773a (commit) via 81e77426e554a61d85e1738af604359171a6062e (commit) via 6dba57232914a1952dedea70a1dad38142ba7258 (commit) via 074ab58c616a00374c828d1d388880521bab6183 (commit) via a80f8a25871c807af64641ef364ceea852853233 (commit) via 8c16b7c6f229b187bae94cc86ac8fb3df04859df (commit) via b0a3e03cbec5e552698e4dbfacee6ba16313a144 (commit) via 77beaa3018f5cacf8bc51251b50e76041c7eb6cd (commit) via f751758256ca9ab3db2b73e157542a2719296603 (commit) via 7592c32bda5dc3bc45a98b1ddd91be52963b5be2 (commit) via f2988f2bea65e345fd58e0e413b9eef4359d196b (commit) via c17f3fdb2df60b65233b8659e64107e6bf8d34cd (commit) via 3c381d35f551844a7452d77c566a6f88108eb385 (commit) via 8594326ce24db6de841568c0ebcdbf203d4a885a (commit) via fae6f29b149e343bd638e67f25a6a1001ca37fb0 (commit) via 28b191ea76efc0f8c39bc9159cdc10b72ddf8740 (commit) via b9904b535a4ead62a125bacde38e55c570aacb32 (commit) via 8ac91b12cebd54a7eb133cbad4592d497442bd73 (commit) via 26353278549c680e252e407e75ce4ab3fda3386c (commit) via 30121576b576395244b0e4564722abb3d2a44c4c (commit) via 5aa93f8ed37b0ded7a6dc393795441cec1e42d2b (commit) via 031c99d6d1fd44bf6cc28395867b8adf432b9115 (commit) via c178ddde535dddce27fb230cdd1f501f8eb3ba9b (commit) via 72d53ffeda2d0e46a9a24efadab7469a366e4377 (commit) via d14a11cbcfd3bd428580caf198ff724dec634096 (commit) via 9aa3d55fcd611ec1833ba885f06637784105ac90 (commit) via b117e2ae0cf948d4afe59eee6e503f30f184ddba (commit) via 3efc8b39b126c6eaaedcc1585a17105a5ab67a8f (commit) via 5a8e654ebea3dbd4e6157ae0f33f6c452f72c802 (commit) via 64aff3644e9c0b8813cce377c9850dd7906e8056 (commit) via 32e3a80c2a8bd9c1278db3e33ea9b5963db0218a (commit) via 7abf4110cf3d5bb52f515b6fe05a60bd44aa4385 (commit) via ee9412dbcc1deb117af39990c3e777bc0994bb70 (commit) via de8365f4b60a8058ad6b649d34156f231a921b1b (commit) via 5c13206bd991df7efc48043feb3d0ae8489ab835 (commit) from beb5f5c05a5433a10c446b8a6b15db64c75748a5 (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 ead707165e3b084b814ae924e6d206720f414031 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Sun Jun 19 06:40:06 2011 -0400 Added usbinput to default hooks (implements FS#19328) Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> commit 840893e2b37470749d11e249becdba40b91adc92 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 17 20:01:35 2011 -0400 properly support $BASEDIR This add proper support for a $BASEDIR, wherein as much as possible is taken from the user specified root, instead of mixing and matching binaries and modules. This avoids conflicts, particularly with binaries like udev or module-init-tools which may have newer functionality that the root in the $BASEDIR requires. This is somewhat of a large patch, which involves a few key changes: 1) Add a new class of "private" functions: _add_*, which act as a "back end" for the equivalent non-underscore-prefixed functions. 2) Refactor the add_* family of functions to use these new back end functions. This generally simplifies the logic as we have a clear division of labor. 3) Instead of using ldd, which is a glorified wrapper around the RTLD, create a wrapper around the RTLD and invoke it ourselves. This is basically just a small performance improvement -- the bulk of the parsing done by this function's output is done in pure bash. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 99c2b87cdbc3f449b68ed6d0bf2fec624d539972 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 16:29:40 2011 -0400 install/{sata,pata,scsi}: cleanup and simplify * Use loops where possible for module addition * remove superfluous trim operation * remove antiquated filters for modules which do not exist Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 733afaaa9c52e55d047d5e6a5d689131e1fde3e6 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 12 21:41:49 2011 -0400 mkinitcpio: allow absolute paths to preset files Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8ca2543c17819e754d2ebf467acfc65a636d25f2 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 11 22:33:32 2011 -0400 add a PKGBUILD for easier testing from the repo Inspired by the PKGBUILD included with the initscripts repo Signed-off-by: Dave Reisner <d(a)falconindy.com> commit bb2b9737a8343a1a3bb87a15ffb605ce8ff2af70 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 11 21:13:17 2011 -0400 mkinitcpio: catch errors in parse_hook It would be better to catch errors in build as well, but this isn't entirely feasible due to the expectation of some builtins to return non-zero during normal operations (e.g., read returns 1 on EOF). Addresses FS#20661 Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 71f3c2b390e3359c18ad3552ce3ece142937f034 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 10 09:18:47 2011 -0400 README: update copyright year, add self as author Judging by the blamestat, I think I've earned this. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8812e6e99e1b3e0c235a5e132f43d7decda312ad Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 9 14:45:50 2011 -0400 mkinitcpio.5: alphabetize options for easier nav Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3aedc3b1b6dd4e56c74626a15fa00253f9b07716 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 9 14:22:31 2011 -0400 mkinitcpio: only show usage on request Display an actual error message for the user when they enter an incorrect option, or neglect to provide $OPTARG when needed. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 18ba64b65a1d24c7d37e4ddab5c12668e0e097df Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 9 14:18:46 2011 -0400 mkinitcpio: allow overriding the compression method Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 199eea97bad60365dcfd5bac7ea55fc39b2f773a Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 22:39:33 2011 -0400 init: remove unnecessary variable declarations These don't really serve a purpose and might actually munge a test for an unset var. Declare vars as we need them, substituing with default expansions where possible. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 81e77426e554a61d85e1738af604359171a6062e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 22:37:07 2011 -0400 init: declare PATH, remove absolute paths We were never very consistent about this anyways. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 6dba57232914a1952dedea70a1dad38142ba7258 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 18:14:41 2011 -0400 functions: remove get_module_name This is no longer used, as all of our module discovery functions will return clean module names. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 074ab58c616a00374c828d1d388880521bab6183 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 17:04:58 2011 -0400 install/base: cleanup and simplify * Create only the directories that are necessary. If others are needed, they'll be created along the way. As part of this, we create /new_root sooner in init, so it's less jarring to the user if they request a break. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit a80f8a25871c807af64641ef364ceea852853233 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 16 15:01:38 2011 -0400 remove support for -m to add a startup message Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8c16b7c6f229b187bae94cc86ac8fb3df04859df Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 7 11:39:39 2011 -0400 mkinitcpio: declare usage as a heredoc alphabetize the usage while we're at it commit b0a3e03cbec5e552698e4dbfacee6ba16313a144 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 13 15:13:08 2011 -0400 install/keymap: refactor and bashify Write directly to the build root rather than creating temp files to be added later on. Also cleanup syntax to Bash standards. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 77beaa3018f5cacf8bc51251b50e76041c7eb6cd Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 20:27:27 2011 -0400 add -t option to specify alternate build directory This requires some refactoring of how we handle TMPDIR declaration and creation, as well as protecting the way we do cleanup so that we don't error out when cleanup is called prior to TMPDIR being declared. We also add a shortcut to the build root based on the TMPDIR for convenience. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit f751758256ca9ab3db2b73e157542a2719296603 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 13 09:16:38 2011 -0400 mkinitcpio: bashification, part 2/2 mostly consists of syntax changes in the hook parsing loop. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 7592c32bda5dc3bc45a98b1ddd91be52963b5be2 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 20:02:32 2011 -0400 mkinitcpio: bashification, part 1/2 Always use bash's [[ ]], and apply (( )) where arithmetic calculations are made. We also take a few other bash shortcuts to simplify code where possible. We also touch the Makefile here to adjust the sed'ing for directory names. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit f2988f2bea65e345fd58e0e413b9eef4359d196b Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 20:04:59 2011 -0400 functions: simplify parse_hook Since we intentionally word split these variables, a variable containing only white space will never trigger us to iterate on each for loop. Therefore, the existance check is superfluous as it will always pass. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit c17f3fdb2df60b65233b8659e64107e6bf8d34cd Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jun 10 09:57:25 2011 -0400 functions: refactor add_symlink We don't need to add the destination directory -- we can assume this will always be added by another function. We also ignore $BASEDIR as we will never be passing in a path that contains a $BASEDIR so we don't want to erroenous trim a path. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3c381d35f551844a7452d77c566a6f88108eb385 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 19:56:23 2011 -0400 overhaul output, introducing color Output style and coloring is borrowed from makepkg with minor adjustments. Most instances where we encounter fatal errors are replaced with a 'die' function to wrap this up neatly. In addition, we introduce the -n flag, for no-color. As a side effect, we need to source the functions file earlier so we have the output functions available earlier. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8594326ce24db6de841568c0ebcdbf203d4a885a Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 19:33:20 2011 -0400 mkinitcpio: remove cruft in getopts loop We shouldn't guess at what the user does and doesn't want, but rather verify after parsing that what we have is sane. Also, remove the default case label, as this will never be met. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit fae6f29b149e343bd638e67f25a6a1001ca37fb0 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 19:09:40 2011 -0400 declare SAVELIST, QUIET, SHOW_AUTOMODS as faux booleans Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 28b191ea76efc0f8c39bc9159cdc10b72ddf8740 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 18:54:49 2011 -0400 mkinitcpio: refactor and bashify early path calculations This addresses a few issues with creation of images with a $BASEDIR, the most alarming that images would always be created on the real root filesystem, with no regard for any supplied base directory. This also cleans up some repetitive path declaration wrt BASEDIR and MODULEDIR. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit b9904b535a4ead62a125bacde38e55c570aacb32 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 18:36:31 2011 -0400 declare all variables in mkinitcpio We also consolidate our empty variable declarations in mkinitcpio with a simple declare. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8ac91b12cebd54a7eb133cbad4592d497442bd73 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Jun 7 15:42:39 2011 -0400 use consistent vim modelines This also adds a /bin/bash shebang to functions. While not technically necessary, this ensures that vim gives us the correct syntax highlight file. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 26353278549c680e252e407e75ce4ab3fda3386c Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 10:41:41 2011 -0400 mkinitcpio: bashify preset build loop This mainly consists of removing all traces of eval and building the options into an array instead a simple variable. We also make sure that the SCRIPT var is unset, as it may be populated during hook processing. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 30121576b576395244b0e4564722abb3d2a44c4c Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 11 19:46:33 2011 -0400 Makefile: refactor and simplify This should all lead to easier maintenance. * use git-archive to create the tarball, appending DIST_EXTRA to the tarball afterwards. * use commonly defined variables such as ${RM} * always use install, rather than cp to ensure proper permissions * functionize creation of directories * add .PHONY targets * combined commands wherever possible Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5aa93f8ed37b0ded7a6dc393795441cec1e42d2b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 9 14:34:17 2011 -0400 lsinitcpio: new utility to dump contents of images Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 031c99d6d1fd44bf6cc28395867b8adf432b9115 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 01:38:49 2011 -0400 mkinitcpio: allow specifying kernel ver as path to image update the example.preset to show this syntax as an alternative Signed-off-by: Dave Reisner <d(a)falconindy.com> commit c178ddde535dddce27fb230cdd1f501f8eb3ba9b Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 6 01:19:26 2011 -0400 mkinitcpio: use simple PEs instead of externals Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 72d53ffeda2d0e46a9a24efadab7469a366e4377 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 17:34:41 2011 -0400 mkinitcpio.conf: note implicit support for lzop Signed-off-by: Dave Reisner <d(a)falconindy.com> commit d14a11cbcfd3bd428580caf198ff724dec634096 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 16 14:22:59 2011 -0400 functions: document hook API Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 9aa3d55fcd611ec1833ba885f06637784105ac90 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 16 14:22:28 2011 -0400 functions: refactor add_file Properly detect symlinks using the -L shell test, resolving and recursing on discovery. This results in removing a lot of extraneous variable declarations and code. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit b117e2ae0cf948d4afe59eee6e503f30f184ddba Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 15:42:09 2011 -0400 use bsdcpio to create images This is a departure from using gen_init_cpio, which proved to be a huge bottleneck in performance. Tests for existance change from being a call to grep, to a simple shell test. In the process, we have to modify the behavior of the -s option, and we lose the -a option. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3efc8b39b126c6eaaedcc1585a17105a5ab67a8f Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 16:28:14 2011 -0400 functions: remove add_symlink2 This is never used by anything in the official repos. Kill it with fire. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5a8e654ebea3dbd4e6157ae0f33f6c452f72c802 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 17:07:50 2011 -0400 functions: remove add_device This was only ever used in the base layout, and it's not needed. devices will be present if we're using devtmpfs, and created for us by init if we mount on tmpfs. Also, this is part of our move towards using bsdcpio instead of gen_init_cpio, and as a side effect we can no longer support this. Any devices that need to be created should be done so by the runtime hooks, not the install time hooks. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 64aff3644e9c0b8813cce377c9850dd7906e8056 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 13:56:41 2011 -0400 functions: refactor add_module Simplify and fix a few bugs in the process. We rely solely on modinfo for obtaining information about module location, dependencies and firmware. Add a small wrapper function for modinfo that will always specify our $BASEDIR and $KERNELVERSION for us. Also, kill off HAS_MODULES. Since we have ADDED_MODULES, which contains all currently added modules, we can count the elements in this when it comes time to decide to create depmod files. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 32e3a80c2a8bd9c1278db3e33ea9b5963db0218a Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 13:17:19 2011 -0400 functions: cleanup and refactor add_binary Modify the sed filter to remove PIC addresses and ignore the first line which will always be the vdso. Also remove the tls filter, as glibc has had threaded support mainlined for many years now. If a user has a glibc this old, we don't have support for them elsewhere (udev, kernel). We also cleanup the logical flow through this function and remove a lot of cruft that would always return true, or that didn't quite make sense. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 7abf4110cf3d5bb52f515b6fe05a60bd44aa4385 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 8 22:43:44 2011 -0400 dmesg: remove install/hook This should be set via the loglevel= parameter on the kernel cmdline. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit ee9412dbcc1deb117af39990c3e777bc0994bb70 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 5 12:06:31 2011 -0400 mkinitcpio: deprecate install() in install hooks This is an unfortunate name clash with a common utility and should be avoided. Rename the install function to 'build' and warn the user when we discover a hook using an 'install' function. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit de8365f4b60a8058ad6b649d34156f231a921b1b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jun 9 12:53:30 2011 -0400 mkinitcpio.conf: s/raid/mdadm/ 'raid' is the old deprecated hook name, which no longer exists. mdadm is the proper name. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5c13206bd991df7efc48043feb3d0ae8489ab835 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 12 19:12:46 2011 -0400 init: don't attempt modprobe if $MODULES is empty This is harmless when it fails, but it might alarm users. Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: Makefile | 97 +++++----- PKGBUILD | 25 +++ README | 3 +- functions | 432 +++++++++++++++++++++------------------- hooks/btrfs | 4 +- hooks/consolefont | 4 +- hooks/dmesg | 5 - hooks/keymap | 6 +- hooks/memdisk | 6 +- hooks/udev | 6 +- init | 53 +++--- init_functions | 8 +- install/autodetect | 6 +- install/base | 43 ++--- install/btrfs | 2 +- install/consolefont | 2 +- install/dmesg | 18 -- install/dsdt | 2 +- install/filesystems | 2 +- install/fw | 2 +- install/ide | 2 +- install/keymap | 39 ++--- install/memdisk | 2 +- install/net | 2 +- install/pata | 33 ++-- install/pcmcia | 2 +- install/resume | 3 +- install/sata | 35 ++-- install/scsi | 33 ++-- install/sleep | 2 +- install/udev | 2 +- install/usb | 2 +- install/usbinput | 2 +- lsinitcpio | 138 +++++++++++++ mkinitcpio | 458 +++++++++++++++++++++++++------------------ mkinitcpio.5.txt | 49 +++--- mkinitcpio.conf | 9 +- mkinitcpio.d/example.preset | 2 +- 38 files changed, 865 insertions(+), 676 deletions(-) create mode 100644 PKGBUILD delete mode 100644 hooks/dmesg delete mode 100644 install/dmesg create mode 100755 lsinitcpio hooks/post-receive -- The official mkinitcpio repository

1 0