overridable bootloader; optional extra packages

This commit is contained in:
parazyd 2016-06-09 11:43:26 +02:00
parent 4cc939bb48
commit bc7cfb1ad9
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
2 changed files with 4 additions and 5 deletions

View File

@ -119,8 +119,7 @@ sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' /lib/udev/rules.d/75-persistent-net
rm -f /etc/udev/rules.d/70-persistent-net.rules
export DEBIAN_FRONTEND=noninteractive
apt-get --yes --force-yes install ${base_packages}
apt-get --yes --force-yes install ${system_packages}
apt-get --yes --force-yes install ${base_packages} ${system_packages} ${extra_packages}
apt-get --yes --force-yes dist-upgrade

View File

@ -51,7 +51,7 @@ img_mkimage() {
img_mount
img_rsync_strapdir
img_install_bootloader
[[ -z $override_bootloader ]] && img_install_bootloader
img_umount
}
@ -69,8 +69,8 @@ img_partition_dos() {
pushd ${workdir}
parted ${imgname} --script -- mklabel msdos
parted ${imgname} --script -- mkpart primary ${dos_boot_size}
parted ${imgname} --script -- mkpart primary ${dos_root_size}
parted ${imgname} --script -- mkpart primary ${parted_boot}
parted ${imgname} --script -- mkpart primary ${parted_root}
# setup loopdevice and mappdevice (zlibs/helpers)
findloopmapp