From 533477718ce901a426158a41691b16f5f6db9e76 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 31 Jan 2006 09:29:38 +0000 Subject: slugos-init: make /linuxrc use disk uuids, remove .recovery stuff in 0.10 - the /boot/disk bootstrap now mounts -U uuid if one is available from turnup. turnup checks disk for blkids and no longer complains about .recovery, /boo/* no longer create .recovery or check for it on boot; disconnect the disk or the network to boot to flash on a semi broken system. --- packages/slugos-init/files/functions | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'packages/slugos-init/files/functions') diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index d7e5c9905a..d631579966 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -155,9 +155,8 @@ checkif(){ # boot with this as root. Returns success if it appears ok. checkmount(){ # basic test for init (the kernel will try to load this) - # but require a shell in bin/sh and no .recovery too - test \( ! -f "$1/.recovery" \) -a \ - \( -d "$1/mnt" \) -a \ + # but require a shell in bin/sh too + test \( -d "$1/mnt" \) -a \ \( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \ \( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \ -x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \ @@ -218,7 +217,6 @@ swivel(){ echo -n 80 >/mnt/class/leds/ready/frequency echo -n 80 >/mnt/class/leds/status/frequency umount /mnt - sleep 10 >/.recovery sync;sync;sync exit 1" fi -- cgit v1.2.3