From 656ea85e60047fb5af644214ecb37c97e16f34a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Jul 2004 15:41:47 +0000 Subject: [PATCH] * Ignore failure to set up networking. * Unmount, don't remount / on halt. svn path=/nixu/trunk/; revision=1169 --- boot/boot.sh | 6 ++++-- boot/halt.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/boot.sh b/boot/boot.sh index 191c081c753..a6ce1f2d67a 100644 --- a/boot/boot.sh +++ b/boot/boot.sh @@ -1,5 +1,7 @@ #! @bash@/bin/sh -e +set -e + . @out@/bin/env.sh echo "--- Nix ---" @@ -23,9 +25,9 @@ echo "enabling loopback interface..." ifconfig lo 127.0.0.1 echo "enabling ethernet interface..." -ifconfig eth0 $(cat /etc/networking/local-ip) up +ifconfig eth0 $(cat /etc/networking/local-ip) up || true echo "setting up routing table..." -route add default gw $(cat /etc/networking/gateway-ip) +route add default gw $(cat /etc/networking/gateway-ip) || true echo "boot done." diff --git a/boot/halt.sh b/boot/halt.sh index 8ec9e64535b..c6e000b92b6 100644 --- a/boot/halt.sh +++ b/boot/halt.sh @@ -2,8 +2,8 @@ . @out@/bin/env.sh -echo "remounting / read-only..." -mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors +echo "unmount file systems..." +umount -avt noproc,nonfs,nosmbfs,nodevfs || echo "(failed)" # ignore errors echo "syncing..." sync || echo "(failed)" # ignore errors