diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-tunnel-cleanup | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index d769c1f6..8f0734ed 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -60,9 +60,9 @@ ROOTFSDIR="$3" # Grub options if [ "$GRUB_OPTIONS" ] then - GRUB_OPTIONS="$GRUB_OPTIONS quiet" + GRUB_OPTIONS="$GRUB_OPTIONS quiet rootdelay=5" else - GRUB_OPTIONS=quiet + GRUB_OPTIONS="quiet rootdelay=5" fi # Path to standalone root password reset script @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet rootdelay=5 vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup index 979fb7bd..b8a93244 100755 --- a/scripts/vyatta-tunnel-cleanup +++ b/scripts/vyatta-tunnel-cleanup @@ -28,13 +28,3 @@ foreach my $tun ( $config->listEffectiveNodes() ) { next if ($interface eq $tun); # don't count the one being deleted $tunnel{$mode} = 1; } - -foreach my $type ( keys %encapsulation ) { - # skip if tunnel is still in use - next if $tunnel{$type}; - - my $module = $encapsulation{$type}; - next unless ( -d "/sys/module/$module" ); - system("sudo /sbin/rmmod $module") == 0 - or warn "rmmod $module failed\n"; -} |