diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-image | 2 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 |
3 files changed, 2 insertions, 6 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 diff --git a/scripts/rl-system.init b/scripts/rl-system.init index 48f90833..c220f49e 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -112,10 +112,6 @@ create_ssh_host_keys () { syslog "Creating ssh v2 dsa host key." ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key fi; - if [ ! -f "/etc/ssh/ssh_host_key" ]; then - syslog "Creating ssh v1 host key." - ssh-keygen -q -N '' -t rsa1 -f /etc/ssh/ssh_host_key - fi; if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then syslog "Creating ssh ed25519 host key." ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index bc2c653c..97b408eb 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ |