[arch-projects] [initscripts] [PATCH 02/12] mtab, dmesg: show status

[Dave Reisner]

On Sat, Jun 25, 2011 at 12:15:54PM +0200, Kurt J. Bosch wrote:
> ---
>  rc.sysinit |   28 ++++++++++++++++------------
>  1 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/rc.sysinit b/rc.sysinit
> index 50a8faf..225790d 100755
> --- a/rc.sysinit
> +++ b/rc.sysinit
> @@ -197,12 +197,14 @@ status "Remounting Root Read/Write" \
>  	mount -n -o remount,rw /
>  
>  # don't touch /etc/mtab if it is a symlink to /proc/self/mounts
> -if [[ -L /etc/mtab ]]; then
> -	:
> -elif [[ -x $(type -P findmnt) && -e /proc/self/mountinfo ]]; then
> -	findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab
> -else
> -	cat /proc/mounts >| /etc/mtab
> +if [[ ! -L /etc/mtab ]]; then
> +	stat_busy "Creating mtab"
> +		if [[ -x $(type -P findmnt) && -e /proc/self/mountinfo ]]; then
> +			findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab
> +		else
> +			cat /proc/mounts >| /etc/mtab
> +		fi
> +	if (( $? == 0 )); then stat_done; else stat_fail; fi

Can we stay away from these one line if statements? We don't use them
anywhere else. Otherwise, ACK.

d

>  fi
>  
>  # now mount all the local filesystems
> @@ -271,12 +273,14 @@ fi
>  # Set console font if required
>  set_consolefont
>  
> -if [[ -e /proc/sys/kernel/dmesg_restrict ]] &&
> -	(( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then
> -    install -Tm 0600 <( dmesg ) /var/log/dmesg.log
> -else
> -    install -Tm 0644 <( dmesg ) /var/log/dmesg.log
> -fi
> +stat_busy "Saving dmesg Log"
> +	if [[ -e /proc/sys/kernel/dmesg_restrict ]] &&
> +		(( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then
> +		install -Tm 0600 <( dmesg ) /var/log/dmesg.log
> +	else
> +		install -Tm 0644 <( dmesg ) /var/log/dmesg.log
> +	fi
> +if (( $? == 0 )); then stat_done; else stat_fail; fi
>  
>  run_hook sysinit_end
>  
> -- 
> 1.7.1
>