Merge branch 'next' of https://git.devuan.org/sdk/libdevuansdk into next
This commit is contained in:
commit
ee56a54cf5
|
|
@ -1,3 +1,7 @@
|
|||
[submodule "extra/devuan-keyring"]
|
||||
path = extra/devuan-keyring
|
||||
url = https://git.devuan.org/devuan-packages/devuan-keyring
|
||||
[submodule "extra/debootstrap"]
|
||||
path = extra/debootstrap
|
||||
url = https://git.devuan.org/devuan-packages/debootstrap
|
||||
branch = suites/jessie
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit d2fd705976704b218898a8639e2d22d8bd46769a
|
||||
|
|
@ -39,7 +39,7 @@ bootstrap_complete_base() {
|
|||
export LC_ALL=C
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
sudo -E debootstrap \
|
||||
sudo -E "$LIBPATH/extra/debootstrap/debootstrap" \
|
||||
--keyring="$LIBPATH/extra/devuan-keyring/keyrings/devuan-archive-keyring.gpg" \
|
||||
--foreign \
|
||||
--arch $arch $release $strapdir $mirror || zerr
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ image_partition_raw_dos() {
|
|||
parted $workdir/${image_name}.img --script -- mklabel msdos
|
||||
parted $workdir/${image_name}.img --script -- mkpart primary ${parted_boot}
|
||||
parted $workdir/${image_name}.img --script -- mkpart primary ${parted_root}
|
||||
[ -n "$bootable_part" ] && \
|
||||
parted "$workdir/${image_name}.img" --script -- set "$bootable_part" boot on
|
||||
|
||||
## get loopdevice (see ./helpers)
|
||||
findloopdev
|
||||
|
|
|
|||
Loading…
Reference in New Issue