Skip to content

Small improvements: getopt + certificate verify failed fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olevole wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Small improvements: getopt + certificate verify failed fix #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 173 additions & 127 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,120 +1,139 @@
#!/bin/sh
version=$1
repo=$2
ref=$3
debug=$4
if [ -z $version ]; then
echo "Usage $0 version"
exit 1
fi
if [ -z "${repo}" ]; then
repo="canonical/cloud-init"
fi
if [ -z "${ref}" ]; then
ref="master"
fi
if [ -z "${debug}" ]; then
debug=""
fi


# Optional args:
# -e - enable UEFI firmware (from current host)
# -v "9.2" - build version, can be multi: -v "9.2 9.3"
# -d - enable debug
EFI=0 # no UEFI by default
EFIMNT= # efi partition mount point
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
MNT=$HOME/new
MNT=$( mktemp -d ) # image mount point
VND=vnd0

VERSION=$( uname -r ) # inherit runtime version
debug=
repo=
ref=

# NetBSD no readlink in base ?
#MYDIR=$( dirname `readlink $0` )
# get cwd
case "${0}" in
.*)
MYDIR=${PWD%%./*} ;;
*)
MYDIR=$( dirname $0 ) ;;
.*)
MYDIR=${PWD%%./*} ;;
*)
MYDIR=$( dirname $0 ) ;;
esac

cleanup()
{
umount -f ${MNT} > /dev/null 2>&1 || true
[ -d "${EFIMNT}" ] && -f ${EFIMNT} > /dev/null 2>&1 || true
vnconfig -u ${VND}
[ -d "${MNT}" ] && rmdir ${MNT} || true
[ -d "${EFIMNT}" ] && rmdir ${EFIMNT} || true
umount -f ${MNT} > /dev/null 2>&1 || true
[ -d "${EFIMNT}" ] && -f ${EFIMNT} > /dev/null 2>&1 || true
vnconfig -u ${VND}
[ -d "${MNT}" ] && rmdir ${MNT} || true
[ -d "${EFIMNT}" ] && rmdir ${EFIMNT} || true
}

while getopts "ev:" opt; do
case "${opt}" in
e) EFI=1 ;;
v) VERSION="${OPTARG}" ;;
esac
while getopts "db:er:v:" opt; do
case "${opt}" in
d) debug=1 ;;
b) ref="${OPTARG}" ;;
e) EFI=1 ;;
r) repo="${OPTARG}" ;;
v) VERSION="${OPTARG}" ;;
esac
done

if [ -z "${repo}" ]; then
repo="canonical/cloud-init"
fi
if [ -z "${ref}" ]; then
ref="master"
fi

trap "cleanup" HUP INT ABRT BUS TERM EXIT

set -eux

# Optional args:
# -e - enable UEFI firmware (from current host)
# -v "8.1" - build version
EFI=0 # no UEFI by default
MNT=$( mktemp -d ) # image mount point
EFIMNT= # efi partition mount point
export PATH
file="final.raw"
mkdir -p ${MNT}
dd if=/dev/zero of=${file} bs=4096 count=400000 progress=62000
vnconfig ${VND} ${file}
gpt create ${VND}
[ ${EFI} -eq 1 ] && gpt add -a 2m -l "EFI system" -t efi -s 128m ${VND}
gpt add -a 4k -l swap -s 512m -t swap ${VND}
gpt add -a 4k -s 1000m -l root -t ffs ${VND}
gpt show ${VND}

dkctl ${VND} makewedges
dk_dev=$(dkctl ${VND} listwedges|grep ffs|sed 's,:.*,,')

if [ ${EFI} -eq 1 ]; then
dk_efi_dev=$( dkctl ${VND} listwedges |awk '/type: msdos/{print $1}' | tr -d ":" )
if [ -z "${dk_efi_dev}" ]; then
echo "Unable to locate EFI gpt"
exit 1
fi

newfs_msdos /dev/r${dk_efi_dev}
EFIMNT=$( mktemp -d )
mount -t msdos /dev/${dk_efi_dev} ${EFIMNT}
mkdir -p ${EFIMNT}/EFI/boot
cp /usr/mdec/*.efi ${EFIMNT}/EFI/boot/
umount ${EFIMNT}
rmdir ${EFIMNT}
FFS_INDEX="3"
else
FFS_INDEX="2"
CURL_CMD=$( which curl )
if [ ! -x ${CURL_CMD} ]; then
echo "no such curl, try to install via pkgin"
PATH="/usr/pkg/sbin:/usr/pkg/bin:$PATH"
PKG_PATH="https://cdn.NetBSD.org/pub/pkgsrc/packages"
PKG_PATH="$PKG_PATH/NetBSD/`uname-m`/`uname -r`/All/"
export PATH PKG_PATH
pkg_add pkgin
pkgin -i curl
CURL_CMD=$( which curl )
if [ ! -x ${CURL_CMD} ]; then
echo "error: no such curl"
exit 1
fi
fi

# newfs dos and ffs
sleep 2
newfs -O 2 -n 500000 -b 4096 /dev/r${dk_dev}
mount /dev/${dk_dev} ${MNT}

if echo $version|egrep "^[78]"; then
base_packages="base.tgz etc.tgz kern-GENERIC.tgz man.tgz"
else
base_packages="base.tar.xz etc.tar.xz kern-GENERIC.tar.xz man.tar.xz"
fi
for i in ${base_packages}; do
curl -L http://ftp.fr.netbsd.org/pub/NetBSD/NetBSD-${version}/amd64/binary/sets/${i} | tar xfz - -C ${MNT}
done
sed -i'' "s/^rc_configured=.*/rc_configured=YES/" $MNT/etc/rc.conf
echo 'wscons=YES
for version in ${VERSION}; do
export PATH
file="netbsd-${version}.raw"
mkdir -p ${MNT}
if [ ${EFI} -eq 0 ]; then
dd if=/dev/zero of=${file} bs=4096 count=400000 progress=62000
else
dd if=/dev/zero of=${file} bs=4096 count=800000 progress=62000
fi
vnconfig ${VND} ${file}
gpt create ${VND}
[ ${EFI} -eq 1 ] && gpt add -a 2m -l "EFI system" -t efi -s 128m ${VND}
#gpt add -a 4k -l swap -s 1G -t swap ${VND}
gpt add -a 4k -l swap -s 512m -t swap ${VND}
#gpt add -a 4k -s 2G -l root -t ffs ${VND}
gpt add -a 4k -s 1000m -l root -t ffs ${VND}
gpt show ${VND}

dkctl ${VND} makewedges
dk_dev=$( dkctl ${VND} listwedges | grep ffs | sed 's,:.*,,')
if [ ${EFI} -eq 1 ]; then
dk_efi_dev=$( dkctl ${VND} listwedges | awk '/type: msdos/{print $1}' | tr -d ":" )
if [ -z "${dk_efi_dev}" ]; then
echo "Unable to locate EFI gpt"
exit 1
fi

newfs_msdos /dev/r${dk_efi_dev}
EFIMNT=$( mktemp -d )
mount -t msdos /dev/${dk_efi_dev} ${EFIMNT}
mkdir -p ${EFIMNT}/EFI/boot
cp /usr/mdec/*.efi ${EFIMNT}/EFI/boot/
umount ${EFIMNT}
rmdir ${EFIMNT}
FFS_INDEX="3"
else
FFS_INDEX="2"
fi

# newfs dos and ffs
sleep 2
newfs -O 2 -n 500000 -b 4096 /dev/r${dk_dev}
mount /dev/${dk_dev} ${MNT}

if echo $version | egrep "^[78]"; then
base_packages="base.tgz etc.tgz kern-GENERIC.tgz"
else
base_packages="base.tar.xz etc.tar.xz kern-GENERIC.tar.xz"
fi
for i in ${base_packages}; do
curl -L http://ftp.fr.netbsd.org/pub/NetBSD/NetBSD-${version}/amd64/binary/sets/${i} | tar xfz - -C ${MNT}
done

sed -i'' "s/^rc_configured=.*/rc_configured=YES/" $MNT/etc/rc.conf
echo 'wscons=YES
sshd=YES
grow_root_fs=YES
' >> $MNT/etc/rc.conf

# Adjust FFS index in rc.d script template
sed -Ees:%%FFS_INDEX%%:"${FFS_INDEX}":g \
${MYDIR}/scripts/grow_root_fs.tpl > ${MNT}/etc/rc.d/grow_root_fs
chmod +x $MNT/etc/rc.d/grow_root_fs

# Adjust FFS index in rc.d script template
sed -Ees:%%FFS_INDEX%%:"${FFS_INDEX}":g \
${MYDIR}/scripts/grow_root_fs.tpl > ${MNT}/etc/rc.d/grow_root_fs
chmod +x $MNT/etc/rc.d/grow_root_fs


echo '
echo '
NAME=root / ffs rw 1 1
NAME=swap none swap sw 0 0
kernfs /kern kernfs rw
Expand All @@ -123,42 +142,69 @@ procfs /proc procfs rw
/dev/cd0a /cdrom cd9660 ro,noauto
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
' > $MNT/etc/fstab
cp $MNT/usr/mdec/boot $MNT/boot
cp $MNT/usr/mdec/boot $MNT/boot

#Enable serial console
echo 'menu=Boot with serial console:consdev com0;boot
#Enable serial console
echo 'menu=Boot with serial console:consdev com0;boot
menu=Boot without serial console;boot
default=1
timeout=0' > $MNT/boot.cfg
sed -i 's,^\(tty00.\).*,\1"/usr/libexec/getty std.9600" vt100 on secure,' $MNT/etc/ttys
sed -i 's,^\(ttyE0.\).*,\1"/usr/libexec/getty Pc" wsvt25 on secure,' $MNT/etc/ttys
sed -i 's,#\(screen[[:space:]]0.*\).*,\1,' /etc/wscons.conf

cp /etc/resolv.conf $MNT/etc/resolv.conf

# TODO: use $version again once 9.0 is ready
echo "PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/$version/All/" >> $MNT/etc/pkg_install.conf

( cd $MNT/dev ; ./MAKEDEV all )

curl -L -k https://github.com/${repo}/archive/${ref}.tar.gz | tar xfz - -C $MNT/tmp


chroot $MNT sh -c '. /etc/profile; pkg_add python38'
chroot $MNT sh -c '. /etc/profile; pkg_add mozilla-rootcerts; mozilla-rootcerts install'
chroot $MNT sh -c '. /etc/profile; cd /tmp/cloud-init-*; PYTHON=/usr/pkg/bin/python3.8 ./tools/build-on-netbsd'
# Ensure we've got all the dependency installed as expected
chroot $MNT sh -c '. /etc/profile; /usr/pkg/bin/python3.8 -mcloudinit.handlers.cloud_config'
chroot $MNT sh -c '. /etc/profile; pkg_add pkgin'

echo 'http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/$osrelease/All' > $MNT/usr/pkg/etc/pkgin/repositories.conf
#chroot $MNT sh -c '. /etc/profile; pkgin update'

# Disable root account
test -z "$debug" && chroot $MNT sh -c 'usermod -C yes root'
chmod +t ${MNT}/tmp
mkdir ${MNT}/kern
mkdir ${MNT}/proc
sed -i 's,^\(tty00.\).*,\1"/usr/libexec/getty std.9600" vt100 on secure,' $MNT/etc/ttys
sed -i 's,^\(ttyE0.\).*,\1"/usr/libexec/getty Pc" wsvt25 on secure,' $MNT/etc/ttys
sed -i 's,#\(screen[[:space:]]0.*\).*,\1,' /etc/wscons.conf

cp /etc/resolv.conf $MNT/etc/resolv.conf

# CBSD motd
[ ! -d ${MNT}/usr/pkg/bin ] && mkdir -p ${MNT}/usr/pkg/bin
cp ${MYDIR}/scripts/dynmotd.sh ${MNT}/usr/pkg/bin/
chmod +x ${MNT}/usr/pkg/bin/dynmotd.sh
chown root:wheel ${MNT}/usr/pkg/bin/dynmotd.sh
echo "/usr/pkg/bin/dynmotd.sh" >> ${MNT}/etc/csh.login

# TODO: use $version again once 9.0 is ready
echo "setup pkg_install.conf: PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/$version/All/"
echo "PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/$version/All/" >> $MNT/etc/pkg_install.conf

( cd $MNT/dev ; ./MAKEDEV all )

# NetBSD not in upstream yet?
#curl -L -k https://github.com/goneri/cloud-init/archive/netbsd.tar.gz | tar xfz - -C $MNT/tmp
curl -L -k https://github.com/${repo}/archive/${ref}.tar.gz | tar xfz - -C $MNT/tmp

chroot $MNT sh <<EOF
. /etc/profile;
pkg_add ca-certificates
echo ETCCERTSDIR=/etc/openssl/certs > /usr/pkg/etc/ca-certificates-dir.conf
update-ca-certificates
EOF
chroot $MNT sh -c '. /etc/profile; pkg_add pkgin'
echo 'http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/$osrelease/All' > $MNT/usr/pkg/etc/pkgin/repositories.conf
chroot $MNT sh -c '. /etc/profile; pkg_add python39'
chroot $MNT sh -c 'ln -s /usr/pkg/bin/python3.9 /usr/pkg/bin/python3'

chroot $MNT sh -c '. /etc/profile; pkgin -y install py39-pip'
chroot $MNT sh -c 'ln -s /usr/pkg/bin/pip3.9 /usr/pkg/bin/pip3'
chroot $MNT sh -c '. /etc/profile; pip3 install jsonpatch'

chroot $MNT sh -c '. /etc/profile; pkgin -y install doas'
echo "permit nopass keepenv :wheel" >> ${MNT}/usr/pkg/etc/doas.conf
chmod 0400 ${MNT}/usr/pkg/etc/doas.conf
chroot $MNT sh -c '. /etc/profile; cd /tmp/cloud-init-*; ./tools/build-on-netbsd'

#chroot $MNT sh -c '. /etc/profile; pkgin update'

# Disable root account
test -z "$debug" && chroot $MNT sh -c 'usermod -C yes root'
chmod +t ${MNT}/tmp
mkdir ${MNT}/kern
mkdir ${MNT}/proc

gpt biosboot -L root ${VND}
installboot -v -o timeout=0 /dev/r${dk_dev} /usr/mdec/bootxx_ffsv2

chroot $MNT sh -c '. /etc/profile; pkgin clean all'
rm -rf ${MNT}/tmp/*
done

gpt biosboot -L root ${VND}
installboot -v -o timeout=0 /dev/r${dk_dev} /usr/mdec/bootxx_ffsv2