summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-08-12 22:36:48 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:39 +0100
commitf319841cc8fc9b8fc352bf3389937c34b2faa63a (patch)
treeea18ae5854bda4ad78d302f52f34c68a080973ed
parent7e5d71ed649966976e9555ae357912bb730dd6d0 (diff)
downloadvyos-live-build-f319841cc8fc9b8fc352bf3389937c34b2faa63a.tar.gz
vyos-live-build-f319841cc8fc9b8fc352bf3389937c34b2faa63a.zip
Replacing remaining echo calls with proper echo functions.
-rwxr-xr-xfunctions/defaults.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index dfcef21a8..a13de1b76 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -96,8 +96,8 @@ Set_defaults ()
then
LH_BOOTSTRAP="cdebootstrap"
else
- echo "E: Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install"
- echo "E: debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
+ Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install"
+ Echo_error "E: debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
exit 1
fi
fi
@@ -159,7 +159,7 @@ Set_defaults ()
then
LH_FDISK="fdisk"
else
- echo "E: Can't proces file /sbin/fdisk (FIXME)"
+ Echo_error "Can't proces file /sbin/fdisk"
fi
fi
@@ -175,7 +175,7 @@ Set_defaults ()
then
LH_LOSETUP="losetup"
else
- echo "E: Can't process file /sbin/losetup (FIXME)"
+ Echo_error "Can't process file /sbin/losetup"
fi
fi
@@ -237,7 +237,7 @@ Set_defaults ()
then
LH_ARCHITECTURE="$(dpkg --print-architecture)"
else
- echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
+ Echo_warning "Can't process file /usr/bin/dpkg, setting architecture to i386"
LH_ARCHITECTURE="i386"
fi
fi