diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-10 12:40:59 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-04 17:39:49 +0200 |
| commit | 5e7955190b877abd2993deca7d87099eeebbe1ee (patch) | |
| tree | 586f00f871ed2db4313865ac1379a74a241e65a8 | |
| parent | fdfb568fc5c822b1f093f49846ac582f87546f44 (diff) | |
| download | live-boot-5e7955190b877abd2993deca7d87099eeebbe1ee.tar.gz live-boot-5e7955190b877abd2993deca7d87099eeebbe1ee.zip | |
Using boot.log and /var/log/live/boot.log respectively for overall consistency within all debian-live tools.
| -rwxr-xr-x | scripts/live | 10 | ||||
| -rw-r--r-- | scripts/live-functions | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/live b/scripts/live index 371fac4..70ea06e 100755 --- a/scripts/live +++ b/scripts/live @@ -1255,7 +1255,7 @@ check_dev () if [ "$ISO_DEVICE" = "/" ] then - echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/live-boot.log + echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log else fs_type=$(get_fstype "${ISO_DEVICE}") if is_supported_fs ${fs_type} @@ -1266,7 +1266,7 @@ check_dev () loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '') devname="${loopdevname}" else - echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log + echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log fi fi fi @@ -1499,9 +1499,9 @@ mountroot () exec 6>&1 exec 7>&2 - exec > live-boot.log + exec > boot.log exec 2>&1 - tail -f live-boot.log >&7 & + tail -f boot.log >&7 & tailpid="${!}" # Ensure 'panic' function is overridden @@ -1696,5 +1696,5 @@ mountroot () exec 1>&6 6>&- exec 2>&7 7>&- kill ${tailpid} - [ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null + [ -w "${rootmnt}/var/log/" ] && mkdir -p /var/log/live && cp boot.log "${rootmnt}/var/log/live" 2>/dev/null } diff --git a/scripts/live-functions b/scripts/live-functions index f426ff9..f3668f1 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -76,7 +76,7 @@ panic() { DEB_3="\033[1;31m\`. \`'\` \033[0m" DEB_4="\033[1;31m \`- \033[0m" - LIVELOG="\033[1;37m/live-boot.log\033[0m" + LIVELOG="\033[1;37m/boot.log\033[0m" DEBUG="\033[1;37mdebug\033[0m" # Reset redirections to avoid buffering diff --git a/scripts/live-helpers b/scripts/live-helpers index b90637a..1414156 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -736,7 +736,7 @@ try_mount () fstype=$(get_fstype "${dev}") fi mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \ - ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live-boot.log && return 0 ) + ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > boot.log && return 0 ) fi } |