From f7c45250805c2cbe3d94ab3d6cd5e83177e36c55 Mon Sep 17 00:00:00 2001 From: tim Date: Thu, 21 Jul 2022 17:03:39 +1200 Subject: [PATCH] Added the preinst for base-passwd to avoid a problem with multistrap --- Dockerfile | 3 +++ rootfs/multistrap_lichee_rv_dock.conf | 3 ++- rootfs/setup_rootfs.sh | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3db8df5..1bfb734 100644 --- a/Dockerfile +++ b/Dockerfile @@ -167,6 +167,7 @@ RUN PATH=/build/linux-build/scripts/dtc:$PATH ./u-boot/tools/mkimage -f ${BOARD} FROM builder as build_rootfs ARG BOARD + RUN apt-get install -y mmdebstrap qemu-user-static binfmt-support debian-ports-archive-keyring RUN apt-get install -y multistrap systemd-container RUN apt-get install -y kmod @@ -174,8 +175,10 @@ RUN apt-get install -y kmod WORKDIR /build COPY rootfs/multistrap_$BOARD.conf multistrap.conf +RUN ls RUN multistrap -f multistrap.conf + # Now install the kernel modules into the rootfs WORKDIR /build COPY --from=build_kernel /build/linux-build/ ./linux-build/ diff --git a/rootfs/multistrap_lichee_rv_dock.conf b/rootfs/multistrap_lichee_rv_dock.conf index cca493d..7fcdb9e 100644 --- a/rootfs/multistrap_lichee_rv_dock.conf +++ b/rootfs/multistrap_lichee_rv_dock.conf @@ -8,7 +8,8 @@ aptsources=Debian cleanup=true [Debian] -packages=adduser apt base-files base-passwd bash bsdutils coreutils dash debconf debian-archive-keyring debianutils diffutils dpkg e2fsprogs findutils gcc-12-base gcc-9-base gpgv grep gzip hostname libacl1 libapt-pkg6.0 libattr1 libaudit-common libaudit1 libblkid1 libbz2-1.0 libc-bin libc6 libcap-ng0 libcap2 libcom-err2 libcrypt1 libdb5.3 libdebconfclient0 libext2fs2 libffi8 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed6 libidn2-0 liblz4-1 liblzma5 libmount1 libnettle8 libp11-kit0 libpam-modules libpam-modules-bin libpam-runtime libpam0g libpcre2-8-0 libpcre3 libseccomp2 libselinux1 libsemanage-common libsemanage2 libsepol2 libsmartcols1 libss2 libstdc++6 libtasn1-6 libtinfo6 libudev1 libunistring2 libuuid1 libxxhash0 libzstd1 login logsave lsb-base mawk mount ncurses-base ncurses-bin passwd perl-base sed tar tzdata +packages=adduser base-passwd base-files bash bsdutils coreutils dash +packages=apt debconf debian-archive-keyring debianutils diffutils dpkg e2fsprogs findutils gcc-12-base gcc-9-base gpgv grep gzip hostname libacl1 libapt-pkg6.0 libattr1 libaudit-common libaudit1 libblkid1 libbz2-1.0 libc-bin libc6 libcap-ng0 libcap2 libcom-err2 libcrypt1 libdb5.3 libdebconfclient0 libext2fs2 libffi8 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libhogweed6 libidn2-0 liblz4-1 liblzma5 libmount1 libnettle8 libp11-kit0 libpam-modules libpam-modules-bin libpam-runtime libpam0g libpcre2-8-0 libpcre3 libseccomp2 libselinux1 libsemanage-common libsemanage2 libsepol2 libsmartcols1 libss2 libstdc++6 libtasn1-6 libtinfo6 libudev1 libunistring2 libuuid1 libxxhash0 libzstd1 login logsave lsb-base mawk mount ncurses-base ncurses-bin passwd perl-base sed tar tzdata packages=zlib1g apt-utils cpio cron debconf-i18n dmidecode dmsetup fdisk ifupdown iproute2 iputils-ping isc-dhcp-client isc-dhcp-common kmod less libapparmor1 libargon2-1 libbpf0 libbsd0 libcap2-bin libcryptsetup12 libdevmapper1.02.1 libedit2 libelf1 libestr0 libfastjson4 libfdisk1 libip4tc2 libjansson4 libjson-c5 libkmod2 liblocale-gettext-perl liblognorm5 libmd0 libmnl0 libncurses6 libncursesw6 libnewt0.52 libnftables1 libnftnl11 libpopt0 libprocps8 libreadline8 libslang2 libssl3 libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl libxtables12 logrotate nano netbase nftables procps readline-common sensible-utils packages=pciutils p11-kit udev vim whiptail xxd packages=util-linux util-linux-extra rsyslog dbus diff --git a/rootfs/setup_rootfs.sh b/rootfs/setup_rootfs.sh index ead09b8..d313c88 100755 --- a/rootfs/setup_rootfs.sh +++ b/rootfs/setup_rootfs.sh @@ -5,6 +5,8 @@ # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true export LC_ALL=C LANGUAGE=C LANG=C +/var/lib/dpkg/info/dash.preinst install +/var/lib/dpkg/info/base-passwd.preinst install dpkg --configure -a mount proc -t proc /proc dpkg --configure -a