diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-31 09:29:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-31 09:29:38 +0000 |
| commit | 533477718ce901a426158a41691b16f5f6db9e76 (patch) | |
| tree | 39f0531b63aeb5eae4d388c704f883f7a6d6b08c /packages/slugos-init/files/boot | |
| parent | 36ea4d7a6126f87056d5f03117e9000047d71a3d (diff) | |
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.
Diffstat (limited to 'packages/slugos-init/files/boot')
| -rw-r--r-- | packages/slugos-init/files/boot/disk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index f603d0f711..6077a92ffe 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -15,15 +15,19 @@ if test -n "$1" then device="$1" shift - echo "boot: rootfs: mount $* $device" + echo "boot: rootfs: mount $* $device [$UUID]" # # wait if required test "$sleep" -gt 0 && sleep "$sleep" # # Mount read-write because before exec'ing init - # this script creates the '.recovery' link to - # detect failed boot. No file type is given to - if mount "$@" "$device" /mnt + # If a UUID is given (in the environment) this + # is used in preference to the device, but if + # the UUID mount fails a standard device mount + # is attempted. + if test -n "$UUID" && + mount "$@" -U "$UUID" /mnt || + mount "$@" "$device" /mnt then # checkmount checks for sh, init and no # .recovery plus either mnt or initrd |