From 4669994866d4e6ce0af2b71ba7eb0c5aba42ab4d Mon Sep 17 00:00:00 2001 From: Kim Date: Sat, 24 Dec 2016 15:48:19 +0100 Subject: fix mount issue vyatta-router init script greps on vyos-union instead of vyatta-union --- scripts/build-clearfog-image | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build-clearfog-image b/scripts/build-clearfog-image index df703d8c..143ef9cb 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 systemd.show_status=1 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 systemd.show_status=1 vyos-union=/boot/"$version" console=ttyS0,115200n8 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF -- cgit v1.2.3 From 3898def2f7d734098c62d0e2ad204a1b9acf50e0 Mon Sep 17 00:00:00 2001 From: Kim Date: Mon, 26 Dec 2016 14:01:40 +0100 Subject: make loop so it does not error if no files exist --- scripts/import-local-packages | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/import-local-packages b/scripts/import-local-packages index be8e1688..ae9a9f5c 100755 --- a/scripts/import-local-packages +++ b/scripts/import-local-packages @@ -3,4 +3,9 @@ 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 + cp $f $LOCAL_PKG_DIR +done -- cgit v1.2.3 From 390b668f2b80bb17fa93a5eb998305bbdd1b5b04 Mon Sep 17 00:00:00 2001 From: Kim Date: Mon, 26 Dec 2016 14:20:26 +0100 Subject: include check if file exists --- scripts/import-local-packages | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/import-local-packages b/scripts/import-local-packages index ae9a9f5c..70b4c365 100755 --- a/scripts/import-local-packages +++ b/scripts/import-local-packages @@ -7,5 +7,7 @@ mkdir -p $LOCAL_PKG_DIR FILES=packages/*.deb for f in $FILES do - cp $f $LOCAL_PKG_DIR + if [ -e "$f" ]; then + cp $f $LOCAL_PKG_DIR + fi done -- cgit v1.2.3 From 5126eb75d326d3fc2f1c769e1815fbd244222ba4 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 26 Dec 2016 15:20:45 +0000 Subject: remove verbose systemd status setting from grub --- .../includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 ++++---- scripts/build-clearfog-image | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') 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 143ef9cb..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 vyos-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 vyos-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 -- cgit v1.2.3