From 5878d830a668ca0b91e26d7fd6beaf5ae6ab44f1 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 24 Oct 2018 22:24:54 -0600 Subject: [PATCH 1/8] Update README.md Former-commit-id: b3a8f0f407ec848dfd3420f6a440d5176157300d Former-commit-id: be378dffe0fae6df972f280dfa1db2b60800af61 --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 475c11f4..0db95185 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,12 @@ When you're ready to build, run `sudo ./runme.sh` . Once it's complete, the fin If you run the script without any options, it will build whichever OS you are currently running, and prompt for which desktop environment and repository you wish to use. If you wish, however, you can manually specify these options instead (for example, to script an image to be built nightly or weekly): -* -u - * Unattended mode (skip the menu, required for the other options to function) -* -l - * Linux distribution you wish to build (can be either "Kali" or "Parrot") -* -d - * Desktop environment (can be one of "cinnamon", "gnome", "kde", "lxde", "mate", or "xfce") -* -r (optional) - * Repository (can be either "default" for the distribution's default repo, or an IP address) +| Flag | Option | Description | +| --- | --- | --- | +| -u | Unattended mode | Skip the menu (required for the other options to function) | +| -l | Distribution | Can be either "Kali" or "Parrot" | +| -d | Desktop environment | Can be one of "cinnamon", "gnome", "kde", "lxde", "mate", or "xfce" | +| -r | Repository (optional) | Can be either "default" for the distribution's default repo, or an IP address | ## Examples `sudo ./runme.sh -u -l Kali -d mate -r 192.168.0.30` From 91ebf92400d2774183e43d59ae32bf6416311558 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Sun, 28 Oct 2018 23:59:58 -0600 Subject: [PATCH 2/8] Testing Aptly stuff... Former-commit-id: 019f1ca440fcf2091d65f1b614da3d46de4f7cfc Former-commit-id: df2f046f30ca87e758e1cdf2466f822260bf95d3 --- modules/parrot-build/auto/config | 4 +- modules/parrot-build/auto/config.bak | 125 ++++++++++++++++++ .../common/archives/csec-archive-keyring.gpg | Bin 0 -> 1440 bytes .../templates/common/archives/csec.key | Bin 0 -> 1440 bytes 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100755 modules/parrot-build/auto/config.bak create mode 100644 modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg create mode 100644 modules/parrot-build/templates/common/archives/csec.key diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index a2b5e3d7..cb78b7ad 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -100,8 +100,8 @@ lb config noauto \ --distribution "$dist" \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ - --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/parrot.key" \ - --keyring-packages parrot-archive-keyring \ + --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ + --keyring-packages csec-archive-keyring \ --updates false \ --security false \ --backports false \ diff --git a/modules/parrot-build/auto/config.bak b/modules/parrot-build/auto/config.bak new file mode 100755 index 00000000..a2b5e3d7 --- /dev/null +++ b/modules/parrot-build/auto/config.bak @@ -0,0 +1,125 @@ +#!/bin/bash + +set -e +set -o pipefail # Bashism + +parrot_mirror=http://archive.parrotsec.org/parrot +public_mirror=http://archive.parrotsec.org/parrot + +#public_mirror=http://deb.parrotsec.org/parrot + + +# Detect target architecture and filter args +if [ ! $arch ]; then + arch=$(dpkg --print-architecture) +fi +if [ ! $variant ]; then + variant="home" +fi +dist="parrot" +lb_opts="" +while [ $# -gt 0 ]; do + arg="$1" + case "$arg" in + -a|--arch|--architecture|--architectures) + arch="$2" + temp="$temp "'"'"$arg"'"' + temp="$temp "'"'"$2"'"' + shift + ;; + --distribution) + dist="$2" + shift + ;; + --variant) + variant="$2" + shift + ;; + -p|--proposed-updates) + enable_pu="1" + ;; + --) + ;; + *) + temp="$temp "'"'"$arg"'"' + ;; + esac + shift +done +eval set -- "$temp" + +# live-build doesn't work if --parent-debian-distribution is unknown of +# debian-cd => we have to put a symlink so that it deals with kali like sid +if [ ! -e ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist ]; then + if [ -w ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd ]; then + ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist + else + echo "ERROR: Run this first:" + echo "ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist" + exit 1 + fi +fi + +case "$arch" in + amd64) + lb_opts="$lb_opts --binary-images iso-hybrid --architecture amd64 --debian-installer live --linux-flavours amd64" + ;; + i386) + lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 686-pae" + ;; + 486) + lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 486" + ;; + armel|armhf|arm64) + lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none" + ;; + *) + echo "WARNING: configuration not tested on arch $arch" >&2 + ;; +esac + +# Setup configuration files from variant and options + +# Drop all files that a former run might have put into place +for file in $(cd config && find . -type f); do + file=${file#./*/} + rm -f config/$file || true +done + +cp -rT templates/common config +[ ! -d templates/parrot-$variant ] || cp -rTL templates/parrot-$variant config + +[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/isolinux/menu.cfg +[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/boot/grub/live-theme/theme.txt +[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/isolinux/menu.cfg +[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/boot/grub/live-theme/theme.txt +[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/isolinux/menu.cfg +[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/boot/grub/live-theme/theme.txt + +lb config noauto \ + --distribution "$dist" \ + --debian-installer-distribution "$dist" \ + --archive-areas "main contrib non-free" \ + --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/parrot.key" \ + --keyring-packages parrot-archive-keyring \ + --updates false \ + --security false \ + --backports false \ + --firmware-binary false \ + --firmware-chroot false \ + --compression xz \ + --mirror-bootstrap "$parrot_mirror" \ + --mirror-chroot "$parrot_mirror" \ + --mirror-debian-installer "$parrot_mirror" \ + --mirror-binary "$public_mirror" \ + --iso-application "Parrot" \ + --iso-publisher "Parrot Project" \ + --iso-volume "ParrotSec" \ + --linux-packages linux-image \ + --bootappend-live "boot=live hostname=parrot splash noautomount" \ + --source false \ + $lb_opts \ + "$@" + +#use overlay instead of aufs as union filesystem support for squashfs +sed -i "s/LB_UNION_FILESYSTEM=\"aufs\"/LB_UNION_FILESYSTEM=\"overlay\"/g" config/chroot diff --git a/modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg b/modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..d9f4b7cd3da604b4f3372ea6830aa88e66bd02f5 GIT binary patch literal 1440 zcmZQzU{GLWWMJ}kib!Jsg6M1W_k%Eq4FRkTOpIVw9RmZ)I|e2OnI|uV&q`BCimFlg;3`Cvb|MrSoge|D;dslMC@B;PN80k zZGEEB**W`f?R~s&PV>81rd?m_yOg3dE-3_mJhA`Kf^NBa!DbEYS2rxCfFyHr&`OpmgH?-j8># zT=|-*aVF^Yj8kjOpX>e=p1dve^d99^tNiwc6r4BS{MWa3%W)S8kzkLoyM`yEZ@l~< ze0qh-{AFw3AFV6;&-BT*BqRbo9aR@&Tf7vL6|w&(Gm`QMtZWSPF1drIT% zgvgEMK@(J0h%V{2`ne%$xvq}=u33SBTZ@;6_SK_+Z%L z>>Tc?;2iAgte^oVee#nNa}Cw*_}TSW${7<+EOmbWQNc7YXhO*{ zwU#$lub-@9oe^4_>-aJvAh$r+$)W7Tj1>n`Slq2lCnzXzXq#F)eK>OD)~>RgN@43Y zU!AN!pJ$x-_pdx>DjohLJW*p~a>a9b-ao|$ zURnJzab3D%`un)K=bpuNRNvo~oN#RV@&zde|1G&D)718Vn|MyPk?a-ysiND2k6A2S zwxPJQ@QYG!v*(xj8nQme!?TZQH67T0Mk`)@ni}sxpF-{(-a&^ir&~v_%a@8fmv52n z>ZK+6SCvD&$=WGA^P#@5Z0+8geCE&kpJ;7hV_*ix4Z}`Enq4!^eXCxfxLme~%Is&^ z;=CPd{j!S3zAymT+*%RSU)3YUmm+5~iEi;@^AhkZ!`Hk%CvMkq{KBFK(uL&=A zsorSht4ZLKS!93I^$ttuVk6f*59c0yZ{53F;YHw<1$hlyg0>!boS@kmWf||=wBwfh zsh(eHf0F#(N9uWOIePYF@~b5I7dxL`Zb*;Z%o!q~bMToagMLz_smJV#~!&R@T1{P zrwZE=-4K<7PHpc!E191kiP{>Nqp?Ehk5}z4yOPstDc4G7$A(z`PP}}O?>9Kjb~4Jd zNC1-*CoD7K_?7o3SVF<6GG5 zAk`dx|9(}){bzz(W52e&%@)pi6}57UNO9T!4g6uNSWn+nat0JZ)bxOG$mtlHH%fWHUqj;`PJDy}ZjFy$M_C`uxHtHF@JF%2G0U4eikr zZrk@PbWAT^?8g0KbN+Gn3kNtu5BL;(hNYbE0@=prcK_HO?5+8n`TFUSyx5R80ERGI Ai2wiq literal 0 HcmV?d00001 diff --git a/modules/parrot-build/templates/common/archives/csec.key b/modules/parrot-build/templates/common/archives/csec.key new file mode 100644 index 0000000000000000000000000000000000000000..d9f4b7cd3da604b4f3372ea6830aa88e66bd02f5 GIT binary patch literal 1440 zcmZQzU{GLWWMJ}kib!Jsg6M1W_k%Eq4FRkTOpIVw9RmZ)I|e2OnI|uV&q`BCimFlg;3`Cvb|MrSoge|D;dslMC@B;PN80k zZGEEB**W`f?R~s&PV>81rd?m_yOg3dE-3_mJhA`Kf^NBa!DbEYS2rxCfFyHr&`OpmgH?-j8># zT=|-*aVF^Yj8kjOpX>e=p1dve^d99^tNiwc6r4BS{MWa3%W)S8kzkLoyM`yEZ@l~< ze0qh-{AFw3AFV6;&-BT*BqRbo9aR@&Tf7vL6|w&(Gm`QMtZWSPF1drIT% zgvgEMK@(J0h%V{2`ne%$xvq}=u33SBTZ@;6_SK_+Z%L z>>Tc?;2iAgte^oVee#nNa}Cw*_}TSW${7<+EOmbWQNc7YXhO*{ zwU#$lub-@9oe^4_>-aJvAh$r+$)W7Tj1>n`Slq2lCnzXzXq#F)eK>OD)~>RgN@43Y zU!AN!pJ$x-_pdx>DjohLJW*p~a>a9b-ao|$ zURnJzab3D%`un)K=bpuNRNvo~oN#RV@&zde|1G&D)718Vn|MyPk?a-ysiND2k6A2S zwxPJQ@QYG!v*(xj8nQme!?TZQH67T0Mk`)@ni}sxpF-{(-a&^ir&~v_%a@8fmv52n z>ZK+6SCvD&$=WGA^P#@5Z0+8geCE&kpJ;7hV_*ix4Z}`Enq4!^eXCxfxLme~%Is&^ z;=CPd{j!S3zAymT+*%RSU)3YUmm+5~iEi;@^AhkZ!`Hk%CvMkq{KBFK(uL&=A zsorSht4ZLKS!93I^$ttuVk6f*59c0yZ{53F;YHw<1$hlyg0>!boS@kmWf||=wBwfh zsh(eHf0F#(N9uWOIePYF@~b5I7dxL`Zb*;Z%o!q~bMToagMLz_smJV#~!&R@T1{P zrwZE=-4K<7PHpc!E191kiP{>Nqp?Ehk5}z4yOPstDc4G7$A(z`PP}}O?>9Kjb~4Jd zNC1-*CoD7K_?7o3SVF<6GG5 zAk`dx|9(}){bzz(W52e&%@)pi6}57UNO9T!4g6uNSWn+nat0JZ)bxOG$mtlHH%fWHUqj;`PJDy}ZjFy$M_C`uxHtHF@JF%2G0U4eikr zZrk@PbWAT^?8g0KbN+Gn3kNtu5BL;(hNYbE0@=prcK_HO?5+8n`TFUSyx5R80ERGI Ai2wiq literal 0 HcmV?d00001 From 8cc3713c320b96caf737282ef6c5210cab538e7b Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Mon, 29 Oct 2018 00:06:07 -0600 Subject: [PATCH 3/8] Keep Parrot keyring package. Former-commit-id: 6b4999d629e85d29656a4de82d320f733193d7aa Former-commit-id: 7f18e9434f82c00ba7e10b6e104404355a10dbb2 --- modules/parrot-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index cb78b7ad..95907e98 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -101,7 +101,7 @@ lb config noauto \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ - --keyring-packages csec-archive-keyring \ + --keyring-packages parrot-archive-keyring \ --updates false \ --security false \ --backports false \ From 0122c8cb31affbf6aa1b2f585ec5d0990e75f1e9 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Mon, 29 Oct 2018 00:08:54 -0600 Subject: [PATCH 4/8] AAAAAAAAA. Former-commit-id: 5ab5c62f1dac3281414a89c8024c5b42c152151e Former-commit-id: 20008a38e7fa4bcb67930bfc50c0afcd90dab1f6 --- modules/parrot-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index 95907e98..3539d68b 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -100,7 +100,7 @@ lb config noauto \ --distribution "$dist" \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ - --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ + --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ --keyring-packages parrot-archive-keyring \ --updates false \ --security false \ From c8027de5ff5d42d5a93e0edc8b405854e977f27d Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Mon, 29 Oct 2018 13:39:10 -0600 Subject: [PATCH 5/8] Revert "AAAAAAAAA." This reverts commit e0d9bd126de946c4576634ccfba13c1437cdb86c [formerly 20008a38e7fa4bcb67930bfc50c0afcd90dab1f6] [formerly 5ab5c62f1dac3281414a89c8024c5b42c152151e]. Former-commit-id: f1c2c346859c3aae7f6bfdd5dc2e73b2f55e8f2a Former-commit-id: 575f684f073222ec534ba1eb751c97a29fffeadf --- modules/parrot-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index 3539d68b..95907e98 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -100,7 +100,7 @@ lb config noauto \ --distribution "$dist" \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ - --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ + --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ --keyring-packages parrot-archive-keyring \ --updates false \ --security false \ From 2d0143b35dae3d5b99a0f151a071e25a0bf75379 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Mon, 29 Oct 2018 13:39:24 -0600 Subject: [PATCH 6/8] Revert "Keep Parrot keyring package." This reverts commit 006ec2c9fe5cee690af2c6a1e488aba06d9a7338 [formerly 7f18e9434f82c00ba7e10b6e104404355a10dbb2] [formerly 6b4999d629e85d29656a4de82d320f733193d7aa]. Former-commit-id: 7abb5d8f679ba39d7f4ed78b3951af6211672b09 Former-commit-id: f9062b6d95b29b6aad6c1420b11109e0fbf17b77 --- modules/parrot-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index 95907e98..cb78b7ad 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -101,7 +101,7 @@ lb config noauto \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ - --keyring-packages parrot-archive-keyring \ + --keyring-packages csec-archive-keyring \ --updates false \ --security false \ --backports false \ From 6174626e6df41d169940d0a9a462ba1d6aef1022 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 31 Oct 2018 13:53:53 -0600 Subject: [PATCH 7/8] Temporarily add btrfs-tools here to fix Parrot. Former-commit-id: babb1ab5cef2bbfe1d42101880e74aab16b92bcb Former-commit-id: 9b3b1eec92b16f5784869362b8cf4882a8023efe --- debs/btrfs-tools_4.15.1-1build1_amd64.deb | Bin 0 -> 2604 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 debs/btrfs-tools_4.15.1-1build1_amd64.deb diff --git a/debs/btrfs-tools_4.15.1-1build1_amd64.deb b/debs/btrfs-tools_4.15.1-1build1_amd64.deb new file mode 100644 index 0000000000000000000000000000000000000000..48964e9c2e4b865f2e3658d65b703cfa37bf6003 GIT binary patch literal 2604 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 BzH9&h literal 0 HcmV?d00001 From a2aa8a0a6e1404dae5e04e93abf67c4a3c2bcaec Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 31 Oct 2018 13:55:10 -0600 Subject: [PATCH 8/8] Revert "Testing Aptly stuff..." This reverts commit 270ac0721a301991110449c56568b82c2c35df0f [formerly df2f046f30ca87e758e1cdf2466f822260bf95d3] [formerly 019f1ca440fcf2091d65f1b614da3d46de4f7cfc]. Former-commit-id: d51e40f9d3bf2a64b6db99e4fb3eb6bf160048a6 Former-commit-id: 45a997e45c5fe8aa4c91e33647284bd396f2bfa1 --- modules/parrot-build/auto/config | 4 +- modules/parrot-build/auto/config.bak | 125 ------------------ .../common/archives/csec-archive-keyring.gpg | Bin 1440 -> 0 bytes .../templates/common/archives/csec.key | Bin 1440 -> 0 bytes 4 files changed, 2 insertions(+), 127 deletions(-) delete mode 100755 modules/parrot-build/auto/config.bak delete mode 100644 modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg delete mode 100644 modules/parrot-build/templates/common/archives/csec.key diff --git a/modules/parrot-build/auto/config b/modules/parrot-build/auto/config index cb78b7ad..a2b5e3d7 100755 --- a/modules/parrot-build/auto/config +++ b/modules/parrot-build/auto/config @@ -100,8 +100,8 @@ lb config noauto \ --distribution "$dist" \ --debian-installer-distribution "$dist" \ --archive-areas "main contrib non-free" \ - --debootstrap-options "--include=ca-certificates,csec-archive-keyring,gnupg --keyring=templates/common/archives/csec.key" \ - --keyring-packages csec-archive-keyring \ + --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/parrot.key" \ + --keyring-packages parrot-archive-keyring \ --updates false \ --security false \ --backports false \ diff --git a/modules/parrot-build/auto/config.bak b/modules/parrot-build/auto/config.bak deleted file mode 100755 index a2b5e3d7..00000000 --- a/modules/parrot-build/auto/config.bak +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail # Bashism - -parrot_mirror=http://archive.parrotsec.org/parrot -public_mirror=http://archive.parrotsec.org/parrot - -#public_mirror=http://deb.parrotsec.org/parrot - - -# Detect target architecture and filter args -if [ ! $arch ]; then - arch=$(dpkg --print-architecture) -fi -if [ ! $variant ]; then - variant="home" -fi -dist="parrot" -lb_opts="" -while [ $# -gt 0 ]; do - arg="$1" - case "$arg" in - -a|--arch|--architecture|--architectures) - arch="$2" - temp="$temp "'"'"$arg"'"' - temp="$temp "'"'"$2"'"' - shift - ;; - --distribution) - dist="$2" - shift - ;; - --variant) - variant="$2" - shift - ;; - -p|--proposed-updates) - enable_pu="1" - ;; - --) - ;; - *) - temp="$temp "'"'"$arg"'"' - ;; - esac - shift -done -eval set -- "$temp" - -# live-build doesn't work if --parent-debian-distribution is unknown of -# debian-cd => we have to put a symlink so that it deals with kali like sid -if [ ! -e ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist ]; then - if [ -w ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd ]; then - ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist - else - echo "ERROR: Run this first:" - echo "ln -sf sid ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/$dist" - exit 1 - fi -fi - -case "$arch" in - amd64) - lb_opts="$lb_opts --binary-images iso-hybrid --architecture amd64 --debian-installer live --linux-flavours amd64" - ;; - i386) - lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 686-pae" - ;; - 486) - lb_opts="$lb_opts --binary-images iso-hybrid --architecture i386 --debian-installer live --linux-flavours 486" - ;; - armel|armhf|arm64) - lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none" - ;; - *) - echo "WARNING: configuration not tested on arch $arch" >&2 - ;; -esac - -# Setup configuration files from variant and options - -# Drop all files that a former run might have put into place -for file in $(cd config && find . -type f); do - file=${file#./*/} - rm -f config/$file || true -done - -cp -rT templates/common config -[ ! -d templates/parrot-$variant ] || cp -rTL templates/parrot-$variant config - -[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/isolinux/menu.cfg -[ ! $arch ] || sed -i "s/ISO_ARCH/$arch/g" config/includes.binary/boot/grub/live-theme/theme.txt -[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/isolinux/menu.cfg -[ ! $version ] || sed -i "s/ISO_VERSION/$version/g" config/includes.binary/boot/grub/live-theme/theme.txt -[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/isolinux/menu.cfg -[ ! $variant ] || sed -i "s/ISO_TITLE/Parrot $variant/g" config/includes.binary/boot/grub/live-theme/theme.txt - -lb config noauto \ - --distribution "$dist" \ - --debian-installer-distribution "$dist" \ - --archive-areas "main contrib non-free" \ - --debootstrap-options "--include=ca-certificates,parrot-archive-keyring,gnupg --keyring=templates/common/archives/parrot.key" \ - --keyring-packages parrot-archive-keyring \ - --updates false \ - --security false \ - --backports false \ - --firmware-binary false \ - --firmware-chroot false \ - --compression xz \ - --mirror-bootstrap "$parrot_mirror" \ - --mirror-chroot "$parrot_mirror" \ - --mirror-debian-installer "$parrot_mirror" \ - --mirror-binary "$public_mirror" \ - --iso-application "Parrot" \ - --iso-publisher "Parrot Project" \ - --iso-volume "ParrotSec" \ - --linux-packages linux-image \ - --bootappend-live "boot=live hostname=parrot splash noautomount" \ - --source false \ - $lb_opts \ - "$@" - -#use overlay instead of aufs as union filesystem support for squashfs -sed -i "s/LB_UNION_FILESYSTEM=\"aufs\"/LB_UNION_FILESYSTEM=\"overlay\"/g" config/chroot diff --git a/modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg b/modules/parrot-build/templates/common/archives/csec-archive-keyring.gpg deleted file mode 100644 index d9f4b7cd3da604b4f3372ea6830aa88e66bd02f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1440 zcmZQzU{GLWWMJ}kib!Jsg6M1W_k%Eq4FRkTOpIVw9RmZ)I|e2OnI|uV&q`BCimFlg;3`Cvb|MrSoge|D;dslMC@B;PN80k zZGEEB**W`f?R~s&PV>81rd?m_yOg3dE-3_mJhA`Kf^NBa!DbEYS2rxCfFyHr&`OpmgH?-j8># zT=|-*aVF^Yj8kjOpX>e=p1dve^d99^tNiwc6r4BS{MWa3%W)S8kzkLoyM`yEZ@l~< ze0qh-{AFw3AFV6;&-BT*BqRbo9aR@&Tf7vL6|w&(Gm`QMtZWSPF1drIT% zgvgEMK@(J0h%V{2`ne%$xvq}=u33SBTZ@;6_SK_+Z%L z>>Tc?;2iAgte^oVee#nNa}Cw*_}TSW${7<+EOmbWQNc7YXhO*{ zwU#$lub-@9oe^4_>-aJvAh$r+$)W7Tj1>n`Slq2lCnzXzXq#F)eK>OD)~>RgN@43Y zU!AN!pJ$x-_pdx>DjohLJW*p~a>a9b-ao|$ zURnJzab3D%`un)K=bpuNRNvo~oN#RV@&zde|1G&D)718Vn|MyPk?a-ysiND2k6A2S zwxPJQ@QYG!v*(xj8nQme!?TZQH67T0Mk`)@ni}sxpF-{(-a&^ir&~v_%a@8fmv52n z>ZK+6SCvD&$=WGA^P#@5Z0+8geCE&kpJ;7hV_*ix4Z}`Enq4!^eXCxfxLme~%Is&^ z;=CPd{j!S3zAymT+*%RSU)3YUmm+5~iEi;@^AhkZ!`Hk%CvMkq{KBFK(uL&=A zsorSht4ZLKS!93I^$ttuVk6f*59c0yZ{53F;YHw<1$hlyg0>!boS@kmWf||=wBwfh zsh(eHf0F#(N9uWOIePYF@~b5I7dxL`Zb*;Z%o!q~bMToagMLz_smJV#~!&R@T1{P zrwZE=-4K<7PHpc!E191kiP{>Nqp?Ehk5}z4yOPstDc4G7$A(z`PP}}O?>9Kjb~4Jd zNC1-*CoD7K_?7o3SVF<6GG5 zAk`dx|9(}){bzz(W52e&%@)pi6}57UNO9T!4g6uNSWn+nat0JZ)bxOG$mtlHH%fWHUqj;`PJDy}ZjFy$M_C`uxHtHF@JF%2G0U4eikr zZrk@PbWAT^?8g0KbN+Gn3kNtu5BL;(hNYbE0@=prcK_HO?5+8n`TFUSyx5R80ERGI Ai2wiq diff --git a/modules/parrot-build/templates/common/archives/csec.key b/modules/parrot-build/templates/common/archives/csec.key deleted file mode 100644 index d9f4b7cd3da604b4f3372ea6830aa88e66bd02f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1440 zcmZQzU{GLWWMJ}kib!Jsg6M1W_k%Eq4FRkTOpIVw9RmZ)I|e2OnI|uV&q`BCimFlg;3`Cvb|MrSoge|D;dslMC@B;PN80k zZGEEB**W`f?R~s&PV>81rd?m_yOg3dE-3_mJhA`Kf^NBa!DbEYS2rxCfFyHr&`OpmgH?-j8># zT=|-*aVF^Yj8kjOpX>e=p1dve^d99^tNiwc6r4BS{MWa3%W)S8kzkLoyM`yEZ@l~< ze0qh-{AFw3AFV6;&-BT*BqRbo9aR@&Tf7vL6|w&(Gm`QMtZWSPF1drIT% zgvgEMK@(J0h%V{2`ne%$xvq}=u33SBTZ@;6_SK_+Z%L z>>Tc?;2iAgte^oVee#nNa}Cw*_}TSW${7<+EOmbWQNc7YXhO*{ zwU#$lub-@9oe^4_>-aJvAh$r+$)W7Tj1>n`Slq2lCnzXzXq#F)eK>OD)~>RgN@43Y zU!AN!pJ$x-_pdx>DjohLJW*p~a>a9b-ao|$ zURnJzab3D%`un)K=bpuNRNvo~oN#RV@&zde|1G&D)718Vn|MyPk?a-ysiND2k6A2S zwxPJQ@QYG!v*(xj8nQme!?TZQH67T0Mk`)@ni}sxpF-{(-a&^ir&~v_%a@8fmv52n z>ZK+6SCvD&$=WGA^P#@5Z0+8geCE&kpJ;7hV_*ix4Z}`Enq4!^eXCxfxLme~%Is&^ z;=CPd{j!S3zAymT+*%RSU)3YUmm+5~iEi;@^AhkZ!`Hk%CvMkq{KBFK(uL&=A zsorSht4ZLKS!93I^$ttuVk6f*59c0yZ{53F;YHw<1$hlyg0>!boS@kmWf||=wBwfh zsh(eHf0F#(N9uWOIePYF@~b5I7dxL`Zb*;Z%o!q~bMToagMLz_smJV#~!&R@T1{P zrwZE=-4K<7PHpc!E191kiP{>Nqp?Ehk5}z4yOPstDc4G7$A(z`PP}}O?>9Kjb~4Jd zNC1-*CoD7K_?7o3SVF<6GG5 zAk`dx|9(}){bzz(W52e&%@)pi6}57UNO9T!4g6uNSWn+nat0JZ)bxOG$mtlHH%fWHUqj;`PJDy}ZjFy$M_C`uxHtHF@JF%2G0U4eikr zZrk@PbWAT^?8g0KbN+Gn3kNtu5BL;(hNYbE0@=prcK_HO?5+8n`TFUSyx5R80ERGI Ai2wiq