commit bc7cfb1ad98066b35b7865619bd498a0f83ba83f parent 4cc939bb48b633bafb7d724b8a4f912273b49aa4 Author: parazyd <parazyd@dyne.org> Date: Thu, 9 Jun 2016 11:43:26 +0200 overridable bootloader; optional extra packages Diffstat:
| M | zlibs/debootstrap | | | 3 | +-- |
| M | zlibs/imaging | | | 6 | +++--- |
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zlibs/debootstrap b/zlibs/debootstrap @@ -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 diff --git a/zlibs/imaging b/zlibs/imaging @@ -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