diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-12-28 00:28:37 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2016-12-28 00:28:37 +0100 |
| commit | 7208424fc06142f2aec6cf43034f99917a6a7c0c (patch) | |
| tree | 0f7fa95dad350642909df9f892df55339020812b | |
| parent | edded1d73f8c5a9cf905d35ac22d6cbe74926c18 (diff) | |
| parent | 52a3899311e92d74dd8bc5caabb095b695223f2c (diff) | |
| download | vyos-build-7208424fc06142f2aec6cf43034f99917a6a7c0c.tar.gz vyos-build-7208424fc06142f2aec6cf43034f99917a6a7c0c.zip | |
Merge branch 'current' of github.com:vyos/vyos-build into current
5 files changed, 22 insertions, 7 deletions
diff --git a/data/live-build-config/hooks/21-systemd_conf.chroot b/data/live-build-config/hooks/21-systemd_conf.chroot new file mode 100755 index 00000000..af618a81 --- /dev/null +++ b/data/live-build-config/hooks/21-systemd_conf.chroot @@ -0,0 +1,6 @@ +#!/bin/sh + +echo I: Show systemd statuson boot. + +echo "ShowStatus=yes" >> /etc/systemd/system.conf +echo "SysVConsole=yes" >> /etc/systemd/system.conf diff --git a/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf b/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf new file mode 100644 index 00000000..7eee7bd3 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf @@ -0,0 +1,2 @@ +[Unit] +After=vyatta-router.service diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry index fa02be5b..4107e459 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry @@ -1,20 +1,20 @@ menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=ttyS0,9600 console=tty0 + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 initrd /boot//initrd.img } menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=tty0 console=ttyS0,9600 + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 initrd /boot//initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet systemd.show_status=1 vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } diff --git a/scripts/build-clearfog-image b/scripts/build-clearfog-image index df703d8c..0ef6d323 100755 --- a/scripts/build-clearfog-image +++ b/scripts/build-clearfog-image @@ -122,12 +122,12 @@ fi menuentry "VyOS $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live systemd.show_status=1 quiet vyatta-union=/boot/"$version" console=ttyS0,115200n8 + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200n8 initrd /boot/"$version"/initrd.img } menuentry "Lost password change $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live quiet systemd.show_status=1 vyatta-union=/boot/"$version" console=ttyS0,115200n8 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200n8 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF diff --git a/scripts/import-local-packages b/scripts/import-local-packages index be8e1688..70b4c365 100755 --- a/scripts/import-local-packages +++ b/scripts/import-local-packages @@ -3,4 +3,11 @@ LOCAL_PKG_DIR=build/config/packages.chroot mkdir -p $LOCAL_PKG_DIR -cp packages/*.deb $LOCAL_PKG_DIR + +FILES=packages/*.deb +for f in $FILES +do + if [ -e "$f" ]; then + cp $f $LOCAL_PKG_DIR + fi +done |