diff options
author | Kim <kim.sidney@gmail.com> | 2018-11-23 21:59:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 21:59:34 +0100 |
commit | b90629bfe69b25fc171752e4ab543d41c8e0b1be (patch) | |
tree | d835c6d88757ec9d134e4c927534407b4f1ef1de | |
parent | ad3e56597b55f2b30ac5092b3bac161f2d683cba (diff) | |
parent | 6ef5a1c7333918e5c7ca0f24708454c440a1a903 (diff) | |
download | vyos-build-b90629bfe69b25fc171752e4ab543d41c8e0b1be.tar.gz vyos-build-b90629bfe69b25fc171752e4ab543d41c8e0b1be.zip |
Merge pull request #30 from vyos/current
crux merge
-rw-r--r-- | README.md | 13 | ||||
-rw-r--r-- | data/live-build-config/archives/saltstack.key.chroot | 31 | ||||
-rwxr-xr-x | scripts/build-config | 1 | ||||
-rw-r--r-- | scripts/defaults.py | 2 | ||||
-rwxr-xr-x | scripts/live-build-config | 3 | ||||
-rw-r--r-- | tools/cloud-init/AWS/config.boot.default | 10 |
6 files changed, 55 insertions, 5 deletions
@@ -48,12 +48,12 @@ There are several directories with their own purpose: ## Prerequisites -To build a VyOS image, you need Debian 8 "Jessie" environment (with jessie-backports repository). -You can create it with [debootstrap](https://wiki.debian.org/Debootstrap) on Debian, Ubuntu and many -other distributions. To create a Debian 8 "Jessie" environment under vyos-chroot -directory, run these commands: +To build a VyOS 1.2.0 image, you need Debian 8 "Jessie" environment (with jessie-backports repository). -Note: This is on Debian/Ubuntu, adjust it for your favorite distro package manager! +If you do not have a Debian Jessie machine, you may create a chroot environment with the +[debootstrap](https://wiki.debian.org/Debootstrap) tool. + +For example, on another version of Debian or another Debian-based distro, these commands will work: ```bash $ sudo apt-get install debootstrap @@ -64,6 +64,9 @@ $ echo "deb http://deb.debian.org/debian jessie-backports main" >> /etc/apt/sour $ apt-get update ``` +If you are working on a Debian Jessie machine, no special preparation is needed, you only +need to enable jessie-backports and install build dependencies. + Several packages are required for building the ISO: * `python3` * `live-build` diff --git a/data/live-build-config/archives/saltstack.key.chroot b/data/live-build-config/archives/saltstack.key.chroot new file mode 100644 index 00000000..14bd7d98 --- /dev/null +++ b/data/live-build-config/archives/saltstack.key.chroot @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQENBFOpvpgBCADkP656H41i8fpplEEB8IeLhugyC2rTEwwSclb8tQNYtUiGdna9 +m38kb0OS2DDrEdtdQb2hWCnswxaAkUunb2qq18vd3dBvlnI+C4/xu5ksZZkRj+fW +tArNR18V+2jkwcG26m8AxIrT+m4M6/bgnSfHTBtT5adNfVcTHqiT1JtCbQcXmwVw +WbqS6v/LhcsBE//SHne4uBCK/GHxZHhQ5jz5h+3vWeV4gvxS3Xu6v1IlIpLDwUts +kT1DumfynYnnZmWTGc6SYyIFXTPJLtnoWDb9OBdWgZxXfHEcBsKGha+bXO+m2tHA +gNneN9i5f8oNxo5njrL8jkCckOpNpng18BKXABEBAAG0MlNhbHRTdGFjayBQYWNr +YWdpbmcgVGVhbSA8cGFja2FnaW5nQHNhbHRzdGFjay5jb20+iQE4BBMBAgAiBQJT +qb6YAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAOCKFJ3le/vhkqB/0Q +WzELZf4d87WApzolLG+zpsJKtt/ueXL1W1KA7JILhXB1uyvVORt8uA9FjmE083o1 +yE66wCya7V8hjNn2lkLXboOUd1UTErlRg1GYbIt++VPscTxHxwpjDGxDB1/fiX2o +nK5SEpuj4IeIPJVE/uLNAwZyfX8DArLVJ5h8lknwiHlQLGlnOu9ulEAejwAKt9CU +4oYTszYM4xrbtjB/fR+mPnYh2fBoQO4d/NQiejIEyd9IEEMd/03AJQBuMux62tjA +/NwvQ9eqNgLw9NisFNHRWtP4jhAOsshv1WW+zPzu3ozoO+lLHixUIz7fqRk38q8Q +9oNR31KvrkSNrFbA3D89uQENBFOpvpgBCADJ79iH10AfAfpTBEQwa6vzUI3Eltqb +9aZ0xbZV8V/8pnuU7rqM7Z+nJgldibFk4gFG2bHCG1C5aEH/FmcOMvTKDhJSFQUx +uhgxttMArXm2c22OSy1hpsnVG68G32Nag/QFEJ++3hNnbyGZpHnPiYgej3FrerQJ +zv456wIsxRDMvJ1NZQB3twoCqwapC6FJE2hukSdWB5yCYpWlZJXBKzlYz/gwD/Fr +GL578WrLhKw3UvnJmlpqQaDKwmV2s7MsoZogC6wkHE92kGPG2GmoRD3ALjmCvN1E +PsIsQGnwpcXsRpYVCoW7e2nW4wUf7IkFZ94yOCmUq6WreWI4NggRcFC5ABEBAAGJ +AR8EGAECAAkFAlOpvpgCGwwACgkQDgihSd5Xv74/NggA08kEdBkiWWwJZUZEy7cK +WWcgjnRuOHd4rPeT+vQbOWGu6x4bxuVf9aTiYkf7ZjVF2lPn97EXOEGFWPZeZbH4 +vdRFH9jMtP+rrLt6+3c9j0M8SIJYwBL1+CNpEC/BuHj/Ra/cmnG5ZNhYebm76h5f +T9iPW9fFww36FzFka4VPlvA4oB7ebBtquFg3sdQNU/MmTVV4jPFWXxh4oRDDR+8N +1bcPnbB11b5ary99F/mqr7RgQ+YFF0uKRE3SKa7a+6cIuHEZ7Za+zhPaQlzAOZlx +fuBmScum8uQTrEF5+Um5zkwC7EXTdH1co/+/V/fpOtxIg4XO4kcugZefVm5ERfVS +MA== +=dtMN +-----END PGP PUBLIC KEY BLOCK----- diff --git a/scripts/build-config b/scripts/build-config index 008311ad..76e83192 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -57,6 +57,7 @@ options = { 'debian-mirror': ('Debian repository mirror for ISO build', lambda: defaults.DEBIAN_MIRROR, None), 'debian-security-mirror': ('Debian security updated mirror', lambda: defaults.DEBIAN_SECURITY_MIRROR, None), 'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: defaults.DEBIAN_MIRROR, None), + 'salt-mirror': ('Salt package mirror', lambda: defaults.SALT_MIRROR, None), 'vyos-mirror': ('VyOS package mirror', lambda: defaults.VYOS_MIRROR, None), 'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']), 'custom-packages': ('Custom packages to install from repositories', lambda: '', None), diff --git a/scripts/defaults.py b/scripts/defaults.py index e2173c76..dc305f6d 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -27,6 +27,8 @@ DEBIAN_SECURITY_MIRROR = 'http://ftp.nl.debian.org/debian-security' DEBIAN_DISTRIBUTION = 'jessie' +SALT_MIRROR = 'http://repo.saltstack.com/apt/debian/8/amd64/2017.7' + PBUILDER_CONFIG = os.path.join(BUILD_DIR, 'pbuilderrc') PBUILDER_DIR = os.path.join(BUILD_DIR, 'pbuilder') diff --git a/scripts/live-build-config b/scripts/live-build-config index 6efa0a8c..8c843bcb 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -69,6 +69,7 @@ debug = build_config['debug'] print("Setting up additional APT entries") vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) vyos_debian_repo_entry = "deb {0}/debian {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) +salt_repo_entry = "deb {0} {1} main\n".format(build_config['salt_mirror'], build_config['distribution']) apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE) @@ -76,10 +77,12 @@ if debug: print("Adding these entries to {0}:".format(apt_file)) print("\t", vyos_repo_entry) print("\t", vyos_debian_repo_entry) + print("\t", salt_repo_entry) with open(apt_file, 'w') as f: f.write(vyos_repo_entry) f.write(vyos_debian_repo_entry) + f.write(salt_repo_entry) # Add custom APT entries if build_config['custom_apt_entry']: diff --git a/tools/cloud-init/AWS/config.boot.default b/tools/cloud-init/AWS/config.boot.default index 18f6ef09..de724f0b 100644 --- a/tools/cloud-init/AWS/config.boot.default +++ b/tools/cloud-init/AWS/config.boot.default @@ -1,4 +1,14 @@ system { + host-name vyos + login { + user vyos { + authentication { + encrypted-password "*" + plaintext-password "" + } + level admin + } + } syslog { global { facility all { |