diff options
| author | Dave Reisner <d@falconindy.com> | 2011-06-07 01:56:23 +0200 |
|---|---|---|
| committer | Dave Reisner <d@falconindy.com> | 2011-06-19 23:33:29 +0200 |
| commit | 3c381d35f551844a7452d77c566a6f88108eb385 (patch) | |
| tree | 3be04aa6664363b2102ef7bb6b0ac234cb1a15f3 /install | |
| parent | 8594326ce24db6de841568c0ebcdbf203d4a885a (diff) | |
| download | mkinitcpio-3c381d35f551844a7452d77c566a6f88108eb385.tar.gz mkinitcpio-3c381d35f551844a7452d77c566a6f88108eb385.tar.xz | |
overhaul output, introducing color
Output style and coloring is borrowed from makepkg with minor
adjustments. Most instances where we encounter fatal errors are replaced
with a 'die' function to wrap this up neatly. In addition, we introduce
the -n flag, for no-color.
As a side effect, we need to source the functions file earlier so we
have the output functions available earlier.
Signed-off-by: Dave Reisner <d@falconindy.com>
Diffstat (limited to 'install')
| -rw-r--r-- | install/autodetect | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/autodetect b/install/autodetect index 118c9a5..b195913 100644 --- a/install/autodetect +++ b/install/autodetect @@ -21,7 +21,7 @@ build() if [ ${UID} -eq 0 -o "$(groups | grep disk)" != "" ]; then fss=$(findfs | sort | uniq) if [ -z "${fss}" ]; then - err "Root file system type detection failed." + error "Root file system type detection failed." autodetect_fs_detection_failed=1 fi for fs in ${fss}; do @@ -49,7 +49,7 @@ build() else autodetect_fs_detection_failed=1 autodetect_raid_detection_failed=1 - err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected" + error "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected" fi for m in ${AUTODETECT}; do |