Commit 821623d3 authored by nextime's avatar nextime

Make sure we have sysvinit and keyring in the chroot

parent 335f9ddf
debootstrap (1.0.71-1+devuan1) unstable; urgency=medium
* make devuan-baseconf and devuan-keyring requireds packages
* make sure we have sysvinit-core and not systemd in the chroot
-- Franco (nextime) Lanza <nextime@devuan.org> Fri, 01 May 2015 02:13:04 +0200
debootstrap (1.0.70-1+devuan1) unstable; urgency=medium
* Debianization of debootstrap.
......
......@@ -11,7 +11,7 @@ Vcs-Git: git@git.devuan.org:packages-base/debootstrap.git
Package: debootstrap
Architecture: all
Depends: ${misc:Depends}, wget
Recommends: gnupg, ${keyring}
Recommends: gnupg, ${keyring}, devuan-keyring
Description: Bootstrap a basic Devuan system
debootstrap is used to create a Devuan base system from scratch,
without requiring the availability of dpkg or apt. It does this by
......
......@@ -17,15 +17,17 @@ esac
work_out_debs () {
required="$(get_debs Priority: required)"
devuan_required="devuan-keyring devuan-baseconf sysvinit-core"
devuan_remove="systemd systemd-sysv"
if doing_variant - || doing_variant fakechroot; then
#required="$required $(get_debs Priority: important)"
# ^^ should be getting debconf here somehow maybe
base="$(get_debs Priority: important) devuan-keyring"
base="$(get_debs Priority: important) $devuan_required"
elif doing_variant buildd || doing_variant scratchbox; then
base="apt build-essential devuan-keyring"
base="apt build-essential $devuan_required"
elif doing_variant minbase; then
base="apt devuan-keyring"
base="apt $devuan_required"
fi
if doing_variant fakechroot; then
......@@ -38,6 +40,7 @@ work_out_debs () {
base="$base apt-transport-https ca-certificates"
;;
esac
base=$(without "$base" "$devuan_remove")
}
first_stage_install () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment