diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-08-10 17:00:41 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-10 17:00:41 +0000 |
| commit | da2d1d094813cd5fd15bca26c1ede82db4d0e0ce (patch) | |
| tree | 1a88ea9f4aaea4894ab482cb76a49798ded523a3 /packages | |
| parent | 57e9d2faad832e99be6b1ba6cbe9e743b5b99e3d (diff) | |
| parent | 8c0d10b8635116bfa6caafdd5b24be62a0ddba10 (diff) | |
merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
and 8746aa49b2d44b03e77f44c96aaab655c6477034
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/altboot/altboot.bb | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 4 | ||||
| -rw-r--r-- | packages/altboot/files/init.altboot | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index 80e22d1924..882336e598 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 251368a577..3a6c743f0d 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -182,9 +182,9 @@ set_password() { mount -o remount,rw / if test -z "$MASTER_PASSWORD" then - echo -e "\nAltboot is a boot-manager which allows to boot from SD, CF and NFS" + echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF and NFS" echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh." - echo -e "${C_RED}This is *not* your root password! It is used by altboot alone!${C_RESET}" + echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}" echo -e "${C_BLUE}\nNote:\tThe password will be echoed to the screen\n\tand it will be asked twice for confirmation.${C_RESET}" echo -e "\nPlease enter a new master password:\n" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 26b4639ccd..5c28edb5f3 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -252,11 +252,11 @@ else # Execute scripts in /etc/altboot.rc before doing anything else. # Required for special situations, like booting spitz - RC_FILES=`ls /etc/altboot.rc | grep \\\\.sh$` + RC_FILES=`ls /etc/altboot.rc | grep \.sh$` for file in $RC_FILES do - . $file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!" + . /etc/altboot.rc/$file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!" done if test "$ENABLE_ALTBOOT" != "yes" |