diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-12-31 14:54:20 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-12-31 14:54:20 +0100 |
| commit | bab369dad049dc4376146e5a82c3eb06bfbfd905 (patch) | |
| tree | fea1acda531ec162f835c973374ff5dcec886965 /data | |
| parent | 6d7d528c5a1a6ae4b959112667c7edce1a90d486 (diff) | |
| parent | aa0eb3349d354ea245a243124ee7b3b4cb8ca81f (diff) | |
| download | vyos-build-bab369dad049dc4376146e5a82c3eb06bfbfd905.tar.gz vyos-build-bab369dad049dc4376146e5a82c3eb06bfbfd905.zip | |
Merge branch 'current' into crux
Conflicts:
scripts/live-build-config
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/17-gen_initramfs.chroot | 4 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/30-frr-configs.chroot | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/data/live-build-config/hooks/live/17-gen_initramfs.chroot b/data/live-build-config/hooks/live/17-gen_initramfs.chroot index aced728a..0f5e0ece 100755 --- a/data/live-build-config/hooks/live/17-gen_initramfs.chroot +++ b/data/live-build-config/hooks/live/17-gen_initramfs.chroot @@ -1,4 +1,8 @@ #!/bin/sh echo I: Create initramfs if it does not exist. + +# Kernel complains about non available nls_ascii module when booting from USB pendrive +echo "nls_ascii" >> /etc/initramfs-tools/modules + update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'` diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot index cc169fb5..3bcfdea6 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -32,7 +32,7 @@ bfdd=no daemons_conf = """ vtysh_enable=yes zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -M snmp -n" -bgpd_options=" --daemon -A 127.0.0.1 -M snmp" +bgpd_options=" --daemon -A 127.0.0.1 -M snmp -M rpki" ospfd_options=" --daemon -A 127.0.0.1 -M snmp" ospf6d_options=" --daemon -A ::1 -M snmp" ripd_options=" --daemon -A 127.0.0.1 -M snmp" |