From 85af98589dc44171d216544bbcd47faeba01be28 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 24 Feb 2006 23:34:20 +0000 Subject: altboot: update to 0.0.5-rc5. This version is known to work with kernel 2.4 an 2.6 (all plugins) on Akita --- packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 2 +- packages/altboot/files/altboot-menu/Advanced/70-install-tgz | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'packages/altboot/files/altboot-menu') diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index cf1d1da8e6..3a41fccf79 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -116,7 +116,7 @@ run_module() { # Use configured resolv.conf in the pivoted rootfs echo -n "Copying resolv.conf..." - cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" + #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" check_target "/media/nfsroot" diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index c525b9154c..2ae44fa890 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -102,8 +102,11 @@ clear_directories(){ for d in bin dev media proc sys usr boot etc lib mnt sbin tmp var do - echo "Removing [$1/$d]..." - rm -rf "$1/$d" + if test -d "$1/$d" + then + echo "Removing [$1/$d]..." + rm -rf "$1/$d" + fi done } @@ -128,8 +131,7 @@ install_rootfs_direct(){ echo "Please press to begin the installation" read junk /dev/tty0 2>&1 - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" + test -d "$1" || die "Directory [$1] not found" echo -n "Installing rootfs, please wait..." @@ -208,7 +210,7 @@ install_rootfs_image(){ if test -n "$junk" then - if test "$junk" -gt 1 + if test "$junk" -gt 30 then echo -n "Is [${junk}Mb] correct? [Y|n] " read junk2 -- cgit v1.2.3