root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Log time in ms in livecd script

Browse source
This commit is contained in:
Ramon Buldó 2015-09-20 12:40:49 +02:00
parent 8420231ff6
commit 4efe483bf3
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util.sh
View file

@ -57,14 +57,18 @@ get_timer(){
echo $(date +%s) echo $(date +%s)
} }
get_timer_ms(){
echo $(date +%s%3N)
}
# $1: start timer # $1: start timer
elapsed_time(){ elapsed_time(){
echo $(echo $1 $(get_timer) | awk '{ printf "%0.2f",($2-$1)/60 }') echo $(echo $1 $(get_timer) | awk '{ printf "%0.2f",($2-$1)/60 }')
} }
# $1: start timer # $1: start timer
elapsed_time_seconds(){ elapsed_time_ms(){
echo $(echo $1 $(get_timer) | awk '{ printf "%0.2f",($2-$1) }') echo $(echo $1 $(get_timer_ms) | awk '{ printf "%0.3f",($2-$1)/1000 }')
} }
## ##

42
scripts/livecd
View file

@ -1,57 +1,57 @@
#!/bin/sh #!/bin/sh
livetimer=$(date +%s) livetimer=$(date +%s%3N)
[[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh [[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
load_profile_config "/opt/livecd/profile.conf" load_profile_config "/opt/livecd/profile.conf"
[[ -r /opt/livecd/util-livecd.sh ]] && source /opt/livecd/util-livecd.sh [[ -r /opt/livecd/util-livecd.sh ]] && source /opt/livecd/util-livecd.sh
echo "Loaded scripts - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Loaded scripts - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
CONSOLEFONT="$(kernel_cmdline vconsole.font)" CONSOLEFONT="$(kernel_cmdline vconsole.font)"
CONSOLEMAP="$(kernel_cmdline vconsole.font.map)" CONSOLEMAP="$(kernel_cmdline vconsole.font.map)"
arch=$(uname -m) arch=$(uname -m)
echo "Got consolefont and arch - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Got consolefont and arch - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
# Activate swap # Activate swap
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_swap configure_swap
echo "Activated swap and added to fstab - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Activated swap and added to fstab - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_language configure_language
echo "Languaged configured - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Languaged configured - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
locale-gen locale-gen
echo "Ran locale-gen - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Ran locale-gen - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
# Add BROWSER var in env and workaround for mate-terminal # Add BROWSER var in env and workaround for mate-terminal
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_env configure_env
echo "Configured env - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured env - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_machine_id configure_machine_id
echo "Configured machine-id - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured machine-id - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_sudo configure_sudo
echo "Configured sudoers - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured sudoers - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer)
${autologin} && configure_displaymanager_autologin ${autologin} && configure_displaymanager_autologin
echo "Configured displaymanager autologin - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured displaymanager autologin - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_user_root / configure_user_root /
cp -a /etc/skel/. /root/ cp -a /etc/skel/. /root/
echo "Configured root user - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured root user - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
livetimer=$(get_timer) livetimer=$(get_timer_ms)
configure_alsa / configure_alsa /
# Save settings # Save settings
alsactl -f /etc/asound.state store &>/dev/null alsactl -f /etc/asound.state store &>/dev/null
echo "Configured alsa - Time: $(elapsed_time_seconds ${livetimer}) seconds" >> /var/log/livecd.log echo "Configured alsa - Time: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log