diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-16 12:31:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-16 12:31:48 +0000 |
| commit | e548219776e8934492025573169b3c5e2f8a79d1 (patch) | |
| tree | c5068fd0be7c949a855d3ca95c9cde4d1cd3735a /packages/altboot/files/altboot.func | |
| parent | a20617a89a744f4521065324ebe33811a036b098 (diff) | |
altboot: - Fix image_reconf to propperly mount /home.flash
- Add another bunch of missing redirects for Collie
- Work around error message of playbeep.sh on first-boot
- Re-enable propper failsafe fallthroughs in init.altboot
Diffstat (limited to 'packages/altboot/files/altboot.func')
| -rw-r--r-- | packages/altboot/files/altboot.func | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 31704e4029..94794fa8ff 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -240,37 +240,18 @@ image_conf(){ if test "$junk" = "y" -o "$junk" = "Y" then - cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.orig/" > $1/etc/fstab_ + cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.flash/" > $1/etc/fstab_ mv $1/etc/fstab_ $1/etc/fstab + + mkdir -p $1/home.flash break fi test "$junk" = "" -o "$junk" = n -o "$junk" = N && break done - fi - - echo "" + fi -# if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/var" ) -# then -# while true -# do -# echo "This is mainly for testing purposes." -# echo -n "Do you want to configure /var as a normal non-tmpfs directory? [N|y] " -# read junk -# -# if test "$junk" = "y" -o "$junk" = "Y" -# then -# cat $1/etc/fstab | sed "/.*\/var.*/s/\(.*\)/#\ \1/" > $1/etc/fstab_ -# mv $1/etc/fstab_ $1/etc/fstab -# break -# fi -# -# test "$junk" = "" -o "$junk" = n -o "$junk" = N && break -# done -# fi - echo "" if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) @@ -329,17 +310,17 @@ set_password() { do echo -en "\nNew password: " - stty -echo + stty -echo </dev/tty0 >/dev/tty0 2>&1 read junk1 < /dev/tty0 - stty echo + stty echo </dev/tty0 >/dev/tty0 2>&1 if ! test -z "$junk1" then echo -en "\nRepeat: " - stty -echo + stty -echo </dev/tty0 >/dev/tty0 2>&1 read junk2 < /dev/tty0 - stty echo + stty echo </dev/tty0 >/dev/tty0 2>&1 echo "" if test "$junk1" = "$junk2" @@ -379,9 +360,9 @@ verify_master_pw() { do let cnt=$cnt+$auth_timeout echo -n "Password: " - stty -echo + stty -echo </dev/tty0 >/dev/tty0 2>&1 read junk < /dev/tty0 - stty echo + stty echo </dev/tty0 >/dev/tty0 2>&1 if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD" then |