diff options
| author | Mike Westerhof <mwester@dls.net> | 2006-03-30 15:40:42 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-30 15:40:42 +0000 |
| commit | b95d798344767600d151f34ee898f668ef704f26 (patch) | |
| tree | 926655cfae9f9b48aeabec271456d4dc4ef20f37 /packages | |
| parent | bef8adcd76891ad360f7fedaf3f4c433cf6c409f (diff) | |
| parent | b06947117d509732650abe04637a85953e28a645 (diff) | |
merge of 7b6a90f4a303bd10227810719197dec0ab049efe
and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484
Diffstat (limited to 'packages')
109 files changed, 1280 insertions, 1579 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 7d56cbd3a6..020546dd64 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r26" +PR = "r28" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 3a41fccf79..baa426218b 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -91,7 +91,20 @@ run_module() { do stty echo echo -n "Boot NFS root: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-bootNFS-source.last + then + junk="`cat /etc/.altboot-bootNFS-source.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi + cnt=1 for nfs_mount in $nfs_mounts @@ -99,6 +112,7 @@ run_module() { if test "$junk" = "$cnt" then selection="$nfs_mount" + echo "$junk" > /etc/.altboot-bootNFS-source.last fi let cnt=$cnt+1 done @@ -115,10 +129,10 @@ run_module() { mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs - echo -n "Copying resolv.conf..." + #echo -n "Copying resolv.conf..." #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - check_target "/media/nfsroot" + check_target "/media/nfsroot" bootNFS } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index c6af50a008..4389ff4ff8 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -1,6 +1,7 @@ |