diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:12:22 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:12:22 +0100 |
| commit | 149e23a0045a0fd1c1682f9f0a025ef85d3489fb (patch) | |
| tree | 5b67efe355030d1064bce395076fb0cd0e4f4672 /scripts/install | |
| parent | 55aa99348bdde42b2769737a32d271f707c2066b (diff) | |
| parent | aaf2ce7f84986854d0d660d224ec14eb35c23293 (diff) | |
| download | vyatta-cfg-system-149e23a0045a0fd1c1682f9f0a025ef85d3489fb.tar.gz vyatta-cfg-system-149e23a0045a0fd1c1682f9f0a025ef85d3489fb.zip | |
Merge branch 'equuleus' of github.com:vyos/vyatta-cfg-system into current
* 'equuleus' of github.com:vyos/vyatta-cfg-system:
syslog: fixes 'Option value must be on or off' message
T1743: do not generate ssh rsa1 host keys
Jenkins: import Pipeline from vyos-1x commit 9b5867b7345e1
install-image: T1718 - ISO check in /opt/vyatta/sbin/install-image faulty
T1584: equuleus: buster: consistent grub options for live/installed image
vlan: q-in-q: T1551: add missing if statement to check if vlan interface exists
Restore the vyatta-biosdevname dependency.
update Jenkins file for equuleus
Remove dependency on apparently no longer used biosdevname.
T1499: Allow for usage of systemd interface mappings (#103)
Revert "Update jenkinsfile to equuleus"
Update jenkinsfile to equuleus
[mibs] remove duplicated SNMP mibs present in Debian Buster
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-image | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image index 658a8a39..fecaeed8 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -154,7 +154,7 @@ set_up_new_iso () fi fi - if [ ! -f "$NEW_ISO" ] || ! (file $NEW_ISO | grep -q 9660); then + if [ ! -f "$NEW_ISO" ] || ! (grep -q ISO9660 $NEW_ISO); then fail_exit "\"$NEW_ISO\" is not a valid ISO image file." fi |