diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-09-11 17:05:13 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-09-11 17:05:13 -0700 |
| commit | 3c6142ffeefc1575cfa5c0a370887c2eb0784b57 (patch) | |
| tree | 3447c3fe0f09a5bfca730e6b7bf65f9e426ff9a5 | |
| parent | 2076e70c88b60b4eb5104ef96b9702f7e9ff6499 (diff) | |
| download | vyatta-cfg-system-3c6142ffeefc1575cfa5c0a370887c2eb0784b57.tar.gz vyatta-cfg-system-3c6142ffeefc1575cfa5c0a370887c2eb0784b57.zip | |
Move check for livecd install to before filesystem intialization
Check for install-system failure (because of attempt to install
from active system), to occur before filesystem is destroyed.
Bug 1587
Backport from kenwood.
| -rwxr-xr-x | scripts/install-system | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/install-system b/scripts/install-system index d816c159..105c90a6 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1336,6 +1336,15 @@ if [ -z "$INSTALL_METHOD" ]; then echo fi +# Unless doing union install, must be from live cd +if [ $INSTALL_METHOD != "union" -a $INSTALL_METHOD != "u" ] && + [ -w /live/image -o ! -d /live/image ] +then + echo "install-system can only be run from livecd" + echo "(except if doing union install)" + exit 1 +fi + # TODO: Note installs assume an LBA BIOS. So no boot partition currently. # also note that we are not creating a swap partition right now. if [ "$INSTALL_METHOD" == "parted" ] || [ "$INSTALL_METHOD" == "p" ]; then @@ -1368,13 +1377,6 @@ elif [ "$INSTALL_METHOD" == "vyatta" ]; then sleep 5 fi -if [ ! -d /live/image -o -w /live/image ]; then - if [ -z $UNION ]; then - echo "install-system can only be run from livecd" - exit 1 - fi -fi - # Install the root filesystem install_root_filesystem "$ROOT_PARTITION" |