* Provide support for uncompressed font files as well as compressed * Avoiding using an unnecessary temp file * Support $BASEDIR * Warn when no font is found * Only add the runtime hook if a font is added Signed-off-by: Dave Reisner --- install/consolefont | 52 ++++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 25 deletions(-) diff --git a/install/consolefont b/install/consolefont index 395387b..271fc2f 100644 --- a/install/consolefont +++ b/install/consolefont @@ -1,32 +1,34 @@ -# vim: set ft=sh: +#!/bin/bash + +build() { + local file ext -build() -{ - MODULES="" - BINARIES="" - FILES="" - SCRIPT="consolefont" eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)" - if [ -n "$CONSOLEFONT" ]; then - if [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz ]; then - CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz" - CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psfu.XXXXXX)" - zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE} - add_file ${CONSOLEFONT_FILE} /consolefont.psfu - elif [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz ]; then - CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz" - CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psf.XXXXXX)" - zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE} - add_file ${CONSOLEFONT_FILE} /consolefont.psf - else - echo "consolefont: Font file does not exist or does not end with .psf.gz or .psfu.gz." - fi + if [[ -n "$CONSOLEFONT" ]]; then + for file in "$BASEDIR/usr/share/kbd/consolefonts/$CONSOLEFONT".psf?(u)?(.gz); do + if [[ -e $file ]]; then + [[ $file =~ \.(psfu?)(\.gz)?$ ]] && ext=${BASH_REMATCH[1]} + if [[ $file = *.gz ]]; then + gzip -cd "$file" > "$BUILDROOT/consolefont.$ext" + else + add_file "${file#$BASEDIR}" "/consolefont.$ext" + fi + SCRIPT=consolefont + return 0 + fi + done + error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT" + return 1 + else + warning "consolefont: no font found in %s/etc/rc.conf" "${BASEDIR%/}" + return 1 fi } -help () -{ -cat<

This introduces no logical code changes -- this is purely a syntactical cleanup and standardization across the build hooks. All hooks get the same treatment, adhering to the following style: #!/bin/bash build() { COMMANDS } help() { cat < --- install/btrfs | 15 ++-- install/dsdt | 21 ++---- install/filesystems | 2 +- install/fw | 29 +++----- install/ide | 30 +++----- install/keymap | 2 +- install/memdisk | 19 +++--- install/net | 195 +++++++++++++++++++++++++-------------------------- install/pata | 2 +- install/pcmcia | 28 ++++---- install/resume | 19 ++--- install/sata | 2 +- install/scsi | 2 +- install/sleep | 27 +++---- install/udev | 33 ++++----- install/usb | 30 ++++----- install/usbinput | 30 +++----- 17 files changed, 220 insertions(+), 266 deletions(-) diff --git a/install/btrfs b/install/btrfs index c156bb0..60e6f5c 100644 --- a/install/btrfs +++ b/install/btrfs @@ -1,16 +1,15 @@ -# vim:set ft=sh: +#!/bin/bash -build() -{ +build() { MODULES="$(all_modules btrfs)" BINARIES="/sbin/btrfs" SCRIPT="btrfs" } -help () -{ -cat <http://syslinux.zytor.com/wiki/index.php/MEMDISK). +help() { + cat <http://syslinux.zytor.com/wiki/index.php/MEMDISK). - It requires memdiskfind from syslinux 4.00 or newer. +It requires memdiskfind from syslinux 4.00 or newer. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/install/net b/install/net index 2c816ba..88d0c97 100644 --- a/install/net +++ b/install/net @@ -1,109 +1,106 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ +build() { MODULES="nfs $(checked_modules "/drivers/net/") " - - BINARIES="" - FILES="" SCRIPT="net" add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig" add_binary "/lib/initcpio/nfsmount" "/bin/nfsmount" } -help () -{ -cat< Enable the loopback interface. - ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface. - ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration. - - nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>] - - If the 'nfsroot' parameter is NOT given on the command line, the default - "/tftpboot/%s" will be used. - - <server-ip> Specifies the IP address of the NFS server. If this field - is not given, the default address as determined by the - 'ip' variable (see below) is used. One use of this - parameter is for example to allow using different servers - for RARP and NFS. Usually you can leave this blank. - - <root-dir> Name of the directory on the server to mount as root. If - there is a "%s" token in the string, the token will be - replaced by the ASCII-representation of the client's IP - address. - - <nfs-options> Standard NFS options. All options are separated by commas. - If the options field is not given, the following defaults - will be used: - port = as given by server portmap daemon - rsize = 1024 - wsize = 1024 - timeo = 7 - retrans = 3 - acregmin = 3 - acregmax = 60 - acdirmin = 30 - acdirmax = 60 - flags = hard, nointr, noposix, cto, ac - - root=/dev/nfs - - If you don't use nfsroot= parameter you need to set root=/dev/nfs - to boot from a nfs root by autoconfiguration. +help() { + cat < Enable the loopback interface. +ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface. +ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration. + +nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>] + +If the 'nfsroot' parameter is NOT given on the command line, the default +"/tftpboot/%s" will be used. + +<server-ip> Specifies the IP address of the NFS server. If this field + is not given, the default address as determined by the + 'ip' variable (see below) is used. One use of this + parameter is for example to allow using different servers + for RARP and NFS. Usually you can leave this blank. + +<root-dir> Name of the directory on the server to mount as root. If + there is a "%s" token in the string, the token will be + replaced by the ASCII-representation of the client's IP + address. + +<nfs-options> Standard NFS options. All options are separated by commas. + If the options field is not given, the following defaults + will be used: + port = as given by server portmap daemon + rsize = 1024 + wsize = 1024 + timeo = 7 + retrans = 3 + acregmin = 3 + acregmax = 60 + acdirmin = 30 + acdirmax = 60 + flags = hard, nointr, noposix, cto, ac + +root=/dev/nfs + +If you don't use nfsroot= parameter you need to set root=/dev/nfs +to boot from a nfs root by autoconfiguration. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/install/pata b/install/pata index 75a75c1..c51356e 100644 --- a/install/pata +++ b/install/pata @@ -9,7 +9,7 @@ build() { } help() { - cat<

The doubled up leading slashes annoy me in the verbose output. Signed-off-by: Dave Reisner --- install/base | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/install/base b/install/base index 64ef39a..b4f23d5 100644 --- a/install/base +++ b/install/base @@ -1,7 +1,7 @@ #!/bin/bash build() { - for dir in proc sys dev run /usr/{bin,sbin}; do + for dir in proc sys dev run usr/{bin,sbin}; do add_dir "/$dir" done -- 1.7.6.4

Without specifying this, xargs will split arguments on whitespace as well as newlines, and will interpret quoting and backslashes. When the delimiter is specified, every character is taken literally and only the given delimiter in honored. This sidesteps issues with broken modalias files as evidenced by a MacBookAir3,1 or the bbs thread below: https://bbs.archlinux.org/viewtopic.php?pid=971853 Also fixes FS#25450. Signed-off-by: Dave Reisner --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index 8ce24ea..7f9202f 100644 --- a/functions +++ b/functions @@ -117,7 +117,7 @@ auto_modules() { IFS=$'\n' read -rd '' -a mods < \ <(find /sys/devices -name modalias -exec sort -u {} + | - xargs modprobe -d "$BASEDIR" -aRS "$KERNELVERSION" | + xargs -d $'\n' modprobe -d "$BASEDIR" -aRS "$KERNELVERSION" | sort -u) printf "%s\n" "${mods[@]//-/_}" -- 1.7.6.4

Also make sure that simple variables are declared as null strings. Signed-off-by: Dave Reisner --- functions | 12 +++++++++--- mkinitcpio | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/functions b/functions index 7f9202f..64a1d17 100644 --- a/functions +++ b/functions @@ -115,6 +115,8 @@ _add_symlink() { auto_modules() { # Perform auto detection of modules via sysfs. + local mods= + IFS=$'\n' read -rd '' -a mods < \ <(find /sys/devices -name modalias -exec sort -u {} + | xargs -d $'\n' modprobe -d "$BASEDIR" -aRS "$KERNELVERSION" | @@ -129,6 +131,8 @@ all_modules() { # $@: filter arguments to grep local -i count=0 + local mod= + while read -r -d '' mod; do (( ++count )) mod=${mod##*/} @@ -157,7 +161,7 @@ add_module() { # discovered and added. # $1: module name - local module path dep deps field value + local module= path= dep= deps= field= value= local -i ign_errors=0 if [[ $1 = -@(t|-try) ]]; then @@ -213,6 +217,8 @@ add_full_dir() { # No parsing is performed and the contents of the directory is added as is. # $1: path to directory + local f= + if [[ -n $1 && -d $1 ]]; then for f in "$1"/*; do if [[ -d "$f" ]]; then @@ -277,7 +283,7 @@ add_binary() { # $2: destination on initcpio (optional, defaults to same as source) local -a sodeps - local regex binary dest mode sodep resolved dirname + local line= regex= binary= dest= mode= sodep= resolved= dirname= if [[ ${1:0:1} != '/' ]]; then binary=$(pathlookup "$1") @@ -321,7 +327,7 @@ parse_hook() { # prior to the start of hook processing, and after each hook's build # function is run. - local item + local item= for item in $MODULES; do if [[ ${item:(-1)} = '?' ]]; then diff --git a/mkinitcpio b/mkinitcpio index 49dabbd..82faaaf 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -21,7 +21,7 @@ INSTDIR=install PRESETDIR=mkinitcpio.d COMPRESSION=gzip -declare TMPDIR BASEDIR MODULE_FILE GENIMG PRESET COMPRESSION_OPTIONS BUILDROOT +declare TMPDIR= BASEDIR= MODULE_FILE= GENIMG= PRESET= COMPRESSION_OPTIONS= BUILDROOT= declare NC= BOLD= BLUE= GREEN= RED= YELLOW= declare -i QUIET=1 SHOW_AUTOMODS=0 SAVELIST=0 COLOR=1 declare -a SKIPHOOKS ADDED_MODULES MODPATHS @@ -74,7 +74,7 @@ cleanup () } get_kernver() { - local kernel=$1 + local kernver= kernel=$1 if [[ "${kernel:0:1}" != / ]]; then echo $kernel -- 1.7.6.4

Signed-off-by: Dave Reisner --- mkinitcpio | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index dd67030..98bea64 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -246,7 +246,7 @@ if [[ $GENIMG ]]; then fi if [[ ! -f "$CONFIG" ]]; then - die "Config file does not exist: \`%s'" " $CONFIG" + die "Config file does not exist: \`%s'" "$CONFIG" fi . "$CONFIG" @@ -356,7 +356,7 @@ if [[ "${GENIMG}" ]]; then fi if [[ $errmsg ]]; then - error "Image generation FAILED: %s\n" "$errmsg" + error "Image generation FAILED: %s" "$errmsg" status=1 else msg "Image generation successful" -- 1.7.6.4

Instead of bailing entirely, throw an error, and ensure that we exit with a non-zero status. The user might do something as simple as misspell a hook name which may or may not prevent a useful image from being created. Signed-off-by: Dave Reisner --- mkinitcpio | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 0116722..72e7ec8 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -312,7 +312,8 @@ for hook in ${HOOKS}; do fi parse_hook else - die "Hook '$hook' can not be found." + error "Hook '$hook' can not be found." + (( ++builderrors )) fi done -- 1.7.6.4

Add in 'premount' and 'postmount' as trigger conditions, but also leave in the old 'y' value as a synonym for premount. Signed-off-by: Dave Reisner --- init | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/init b/init index 8c8709c..a0e082e 100644 --- a/init +++ b/init @@ -74,8 +74,8 @@ if [ -e "/hooks" ]; then done fi -if [ "${break}" = "y" ]; then - echo ":: Break requested, type 'exit' to resume operation" +if [ "${break}" = "y" ] || [ "${break}" = "premount" ]; then + echo ":: Pre-mount break requested, type 'exit' to resume operation" launch_interactive_shell fi @@ -100,6 +100,11 @@ elif [ ! -x "/new_root${init}" ]; then launch_interactive_shell --exec fi +if [ "${break}" = "postmount" ]; then + echo ":: Post-mount break requested, type 'exit' to resume operation" + launch_interactive_shell +fi + # Stop udevd if is running if [ "${udevd_running}" -eq 1 ]; then udevadm control --exit -- 1.7.6.4

This is already done in initscripts so we mirror it here. Signed-off-by: Dave Reisner --- init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init b/init index a0e082e..ff4917a 100644 --- a/init +++ b/init @@ -22,7 +22,7 @@ else # /dev/mem is needed if we want to load uvesafb before triggering uevents mknod /dev/mem c 1 1 fi -mount -t tmpfs run /run -o nosuid,noexec,nodev,mode=755,size=10M +mount -t tmpfs run /run -o nosuid,nodev,mode=755,size=10M echo "/sbin/modprobe" > /proc/sys/kernel/modprobe -- 1.7.6.4

This allows a user to provide their own binaries and override anything that might be provided by busybox. Signed-off-by: Dave Reisner --- init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init b/init index ff4917a..e8f70a1 100644 --- a/init +++ b/init @@ -1,6 +1,6 @@ #!/bin/busybox ash # Install busybox's applets as symlinks -PATH=/usr/sbin:/usr/bin:/sbin:/bin +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin busybox --install -s -- 1.7.6.4

This is a constant which will never vary based on setup. Do it during the build to save the forks at runtime. Signed-off-by: Dave Reisner --- init | 4 ---- install/base | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/init b/init index f14261d..8891a69 100644 --- a/init +++ b/init @@ -1,12 +1,8 @@ #!/bin/busybox ash -# Install busybox's applets as symlinks PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -busybox --install -s - . /init_functions -mkdir -p /new_root mount -t proc proc /proc -o nosuid,noexec,nodev mount -t sysfs sys /sys -o nosuid,noexec,nodev if grep -q devtmpfs /proc/filesystems 2>/dev/null; then diff --git a/install/base b/install/base index e85551c..9135ced 100644 --- a/install/base +++ b/install/base @@ -1,10 +1,13 @@ #!/bin/bash build() { - for dir in proc sys dev run usr/{bin,sbin}; do + for dir in proc sys dev run usr/{bin,sbin} new_root; do add_dir "/$dir" done + # install busybox's applets as symlinks + /lib/initcpio/busybox --install -s "$BUILDROOT/usr/bin" + add_binary /lib/initcpio/busybox /bin/busybox add_binary /sbin/modprobe add_binary /sbin/blkid -- 1.7.6.4

Signed-off-by: Dave Reisner --- lsinitcpio | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lsinitcpio b/lsinitcpio index ca2b224..95c0500 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -62,7 +62,7 @@ shift $(( OPTIND - 1 )) declare image=$1 -if [[ -t 2 ]] && (( color )); then +if [[ -t 1 ]] && (( color )); then # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then NC="$(tput sgr0)" -- 1.7.6.4

Signed-off-by: Dave Reisner --- functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/functions b/functions index 64a1d17..ff061f8 100644 --- a/functions +++ b/functions @@ -108,7 +108,7 @@ _add_symlink() { (( $# == 2 )) || return $EINVAL [[ -L "$BUILDROOT$1" ]] && return $EEXIST - (( QUIET )) || plain "adding symlink: %s -> %s" "$2" "$1" + (( QUIET )) || plain "adding symlink: %s -> %s" "$1" "$2" ln -s "$2" "$BUILDROOT$1" } -- 1.7.6.4

If we encounter a BOOT_IMAGE var taken from grub2, the first character could be a '(' which will throw off busybox's parser and error out. Reverse the comparison so that the LHS is always a constant, which can be compared to anything (including nothing at all). Fixes FS#26119. Signed-off-by: Dave Reisner --- init_functions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/init_functions b/init_functions index fe29961..edaf87c 100644 --- a/init_functions +++ b/init_functions @@ -45,8 +45,8 @@ parse_cmdline() { # only export stuff that does work with ash :) *=*) rhs="$(echo "${w}" | cut -d= -f2-)" lhs="$(echo "${w}" | cut -d= -f1 | sed 's|\.|_|g;s|-|_|g;')" - if [ "${rhs:0:1}" = "\"" ]; then - if [ "${rhs:$((${#rhs}-1))}" = "\"" ]; then + if [ "\"" = "${rhs:0:1}" = ]; then + if [ "\"" = "${rhs:$((${#rhs}-1))}" ]; then rhs="${rhs:1:$((${#rhs}-2))}" else rhs="${rhs:1}" @@ -61,7 +61,7 @@ parse_cmdline() { ;; esac else - if [ "${w:$((${#w}-1))}" = "\"" ]; then + if [ "\"" = "${w:$((${#w}-1))}" ]; then rhs="${rhs} ${w:0:$((${#w}-1))}" in_quotes=0 (echo "${lhs}" | grep -qe '^[0-9]' -e '[^a-zA-Z0-9_]') || eval ${lhs}=\${rhs} -- 1.7.6.4

From: Florian Pritz If you run make dist, extract that tarball somewhere else and try to run makepkg it will fail because it can't find the git tree anymore. [Dave: removed --dirty flag, as this breaks makepkg] Signed-off-by: Florian Pritz --- Makefile | 7 +++++-- PKGBUILD | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 18df47f..1a3a815 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for mkinitcpio -VERSION = $(shell if test -f VERSION; then cat VERSION; else git describe; fi) +VERSION = $(shell if test -f VERSION; then cat VERSION; else git describe | sed 's/-/./g'; fi) DIRS = \ /bin \ @@ -68,4 +68,7 @@ dist: clean doc ${RM} -r mkinitcpio-${VERSION} gzip -9 mkinitcpio-${VERSION}.tar -.PHONY: clean dist install tarball +version: + @echo ${VERSION} + +.PHONY: clean dist install tarball version diff --git a/PKGBUILD b/PKGBUILD index 2cb6a6d..b5a3217 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,5 @@ -IFS='-' read -r major minor _ < <(git describe) - pkgname=mkinitcpio-git -pkgver=$major.$minor +pkgver=$(make version) pkgrel=1 pkgdesc="Modular initramfs image creation utility" arch=(any) -- 1.7.6.4