diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-03-02 12:22:30 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:06 +0100 |
| commit | 9372dfef5a743b4478fb9ba5e41b15f5d16631f7 (patch) | |
| tree | abe499ce85cd8931cc35ca7e3b7d606d4d87423a /scripts | |
| parent | 037b3b3c1fc5a6079b011071b2bb6494249b00fb (diff) | |
| download | live-boot-9372dfef5a743b4478fb9ba5e41b15f5d16631f7.tar.gz live-boot-9372dfef5a743b4478fb9ba5e41b15f5d16631f7.zip | |
Adding plainroot.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/scripts/live b/scripts/live index ea770f4..0ed7675 100755 --- a/scripts/live +++ b/scripts/live @@ -386,6 +386,16 @@ Arguments () export EXPOSED_ROOT ;; + plainroot) + PLAIN_ROOT="Yes" + export PLAIN_ROOT + ;; + + root=*) + ROOT="${ARGUMENT#root=}" + export ROOT + ;; + union=*) UNIONTYPE="${ARGUMENT#union=}" export UNIONTYPE @@ -1254,18 +1264,24 @@ mountroot () panic "Unable to find a live file system on the network" fi else - # Scan local devices for the image - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - do - livefs_root=$(find_livefs ${i}) + if [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ] + then + # Do a local boot from hd + livefs_root=${ROOT} + else + # Scan local devices for the image + for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + do + livefs_root=$(find_livefs ${i}) - if [ -n "${livefs_root}" ] - then - break - fi + if [ -n "${livefs_root}" ] + then + break + fi - sleep 1 - done + sleep 1 + done + fi fi if [ -z "${livefs_root}" ] |