summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert "ar" Gerus <ar@bash.org.pl>2013-05-02 06:01:21 +0200
committerRobert "ar" Gerus <ar@bash.org.pl>2013-05-02 06:01:21 +0200
commitac85fddddf668d9dbeba4da214589414218728d5 (patch)
treea8ae388d6598415d73e3fab4bfe0bb7101ba4f9c
parent16d4ee578a54c3dd9f32801203c59ec063b49067 (diff)
downloadtar-xz-loading-initramfs-ac85fddddf668d9dbeba4da214589414218728d5.tar.gz
tar-xz-loading-initramfs-ac85fddddf668d9dbeba4da214589414218728d5.tar.bz2
tar-xz-loading-initramfs-ac85fddddf668d9dbeba4da214589414218728d5.tar.xz
tar-xz-loading-initramfs-ac85fddddf668d9dbeba4da214589414218728d5.zip
Remove bad words from code. :(
-rw-r--r--TODO1
-rwxr-xr-xinitramfs/init10
2 files changed, 5 insertions, 6 deletions
diff --git a/TODO b/TODO
index d4aae64..3176c97 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ YES:
* Configuration examples, HOWTOs
* DNS configuration.
* {pre,post}_hooks for some phases.
- * Remove bad words, especially from error messages.
MAYBE:
* Change the rootfs_part= argument handling, so that it would accept arbitrary
diff --git a/initramfs/init b/initramfs/init
index 4f72ef0..c529a16 100755
--- a/initramfs/init
+++ b/initramfs/init
@@ -11,9 +11,9 @@ alias xzcat='/busybox xzcat'
alias mount='/busybox mount'
alias umount='/busybox umount'
-die() {
+emergency() {
echo ""
- echo -e "${FAIL}Shit broke! Panic shell!${NORMAL}"
+ echo -e "${FAIL}It failed! Panic shell!${NORMAL}"
echo ""
/busybox --install -s
exec /bin/sh
@@ -27,8 +27,8 @@ isok() {
if [[ $1 -eq 0 ]]; then
echo -e "${INFO}[ ${OK}OK${INFO} ]${NORMAL}"
else
- echo -e "${INFO}[ ${FAIL}FUCK${INFO} ]${NORMAL}"
- die
+ echo -e "${INFO}[ ${FAIL}FAIL${INFO} ]${NORMAL}"
+ emergency
fi
}
@@ -164,5 +164,5 @@ echo ""
echo -e "${FAIL}we should not reach this place! here be dragons!${NORMAL}"
echo ""
-die
+emergency