diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-09-11 08:30:07 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-09-11 08:30:07 -0700 |
| commit | d7d1a8051c5e04c3a546f7443c0a910dcad1b579 (patch) | |
| tree | b572af2268d1405605a424c262d2ebf0252a95ff /scripts/install-system | |
| parent | ca9a098690f99357a259953d5fb21b8dac014694 (diff) | |
| download | vyatta-cfg-quagga-d7d1a8051c5e04c3a546f7443c0a910dcad1b579.tar.gz vyatta-cfg-quagga-d7d1a8051c5e04c3a546f7443c0a910dcad1b579.zip | |
Invert test for livecd
Need to check for livecd only if *not* doing union install.
Repair of previous bugfix.
Diffstat (limited to 'scripts/install-system')
| -rwxr-xr-x | scripts/install-system | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install-system b/scripts/install-system index 53b654ed..105c90a6 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1337,8 +1337,8 @@ if [ -z "$INSTALL_METHOD" ]; then fi # Unless doing union install, must be from live cd -if [ "$INSTALL_METHOD" == "union" -o "$INSTALL_METHOD" == "u" ] && - [ ! -d /live/image -o -w /live/image ] +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)" |