vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'current' of github.com:vyos/vyos-build into current

Browse Source
This commit is contained in:
Daniil Baturin 2016-12-28 00:28:37 +01:00
commit 7208424fc0
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/live-build-config/hooks/21-systemd_conf.chroot Executable file
View File

@ -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

2
data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf Normal file
View File

@ -0,0 +1,2 @@
[Unit]
After=vyatta-router.service

8
data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
View File

@ -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
}

4
scripts/build-clearfog-image
View File

@ -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

9
scripts/import-local-packages
View File

@ -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