From b8a921300ee7f3c11a3a19b3cffcd96596845525 Mon Sep 17 00:00:00 2001 From: toby Date: Tue, 25 Sep 2018 08:32:34 +0000 Subject: [PATCH] light cleanup and simplifying, lets see if that actually works --- create_pxeinitrd.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/create_pxeinitrd.sh b/create_pxeinitrd.sh index 4dd507b..9f569e8 100755 --- a/create_pxeinitrd.sh +++ b/create_pxeinitrd.sh @@ -45,7 +45,7 @@ fi echo "Installing Debian $RELEASE..." -debootstrap --variant=minbase --include=$INCLUDES $RELEASE $MNT_DIR $MIRROR || fail "cannot install $RELEASE" +debootstrap --variant=minbase --include=$INCLUDES,$BOOT_PKG $RELEASE $MNT_DIR $MIRROR || fail "cannot install $RELEASE" echo $HOSTNAME > $MNT_DIR/etc/hostname @@ -62,11 +62,10 @@ rm -f $MNT_DIR/etc/apt/sources.list echo 'deb https://mirrors.wit.com/debian sid main contrib non-free' > $MNT_DIR/etc/apt/sources.list echo 'deb https://mirrors.wit.com/debcore sid main' >> $MNT_DIR/etc/apt/sources.list curl https://mirrors.wit.com/debcore/public.key | LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-key add - + LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-get update -LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-get install -y $BOOT_PKG || fail "cannot install $BOOT_PKG" +LANG=C DEBIAN_FRONTEND=noninteractive chroot $MNT_DIR apt-get clean - -chroot $MNT_DIR apt-get clean || fail "unable to clean apt cache" cat /dev/null > $MNT_DIR/etc/machine-id sed -i '/PasswordAuthentication/d' $MNT_DIR/etc/ssh/sshd_config @@ -125,14 +124,6 @@ eval \$execshutdown EOF -cat <$MNT_DIR/root/install.sh -#!/bin/bash -set -eo pipefail -export INSTALLEXTRA="\$@" -curl http://roberto.wit.com:8081/create_local_install.sh | bash -EOF - - cat <$MNT_DIR/etc/dhcpcd.conf hostname duid @@ -144,7 +135,6 @@ require dhcp_server_identifier EOF -chmod +x $MNT_DIR/root/install.sh chmod +x $MNT_DIR/usr/local/bin/start_me_up.sh chmod +x $MNT_DIR/usr/local/bin/shut_me_down.sh