summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2016-12-28 00:28:37 +0100
committerDaniil Baturin <daniil@baturin.org>2016-12-28 00:28:37 +0100
commit7208424fc06142f2aec6cf43034f99917a6a7c0c (patch)
tree0f7fa95dad350642909df9f892df55339020812b /scripts
parentedded1d73f8c5a9cf905d35ac22d6cbe74926c18 (diff)
parent52a3899311e92d74dd8bc5caabb095b695223f2c (diff)
downloadvyos-build-7208424fc06142f2aec6cf43034f99917a6a7c0c.tar.gz
vyos-build-7208424fc06142f2aec6cf43034f99917a6a7c0c.zip
Merge branch 'current' of github.com:vyos/vyos-build into current
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-clearfog-image4
-rwxr-xr-xscripts/import-local-packages9
2 files changed, 10 insertions, 3 deletions
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