From 1224d0454e5dc503f8bd776129c1dfe0076b00dd Mon Sep 17 00:00:00 2001 From: You-Sheng Yang Date: Fri, 3 May 2024 16:49:20 +0800 Subject: [PATCH] enable apt diag messages Signed-off-by: You-Sheng Yang --- examples/debian.sh | 8 ++++---- examples/raspbian.sh | 8 ++++---- examples/steamos.sh | 8 ++++---- examples/ubuntu.sh | 8 ++++---- scripts/debuerreotype-init | 2 +- scripts/debuerreotype-minimizing-config | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/debian.sh b/examples/debian.sh index f12fa4b08..a1b23eacd 100755 --- a/examples/debian.sh +++ b/examples/debian.sh @@ -246,12 +246,12 @@ debuerreotype-debian-sources-list "${sourcesListArgs[@]}" --snapshot "$rootfsDir debuerreotype-minimizing-config "$rootfsDir" -debuerreotype-apt-get "$rootfsDir" update -qq +debuerreotype-apt-get "$rootfsDir" update -q if dpkg --compare-versions "$aptVersion" '>=' '1.1~'; then - debuerreotype-apt-get "$rootfsDir" full-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" full-upgrade -yq else - debuerreotype-apt-get "$rootfsDir" dist-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" dist-upgrade -yq fi if dpkg --compare-versions "$aptVersion" '>=' '0.7.14~'; then @@ -277,7 +277,7 @@ epoch2021="$(date --date '2021-01-01 00:00:00' +%s)" if [ "$epoch" -lt "$epoch2021" ] || { isDebianBusterOrOlder="$([ -f "$rootfsDir/etc/os-release" ] && source "$rootfsDir/etc/os-release" && [ -n "${VERSION_ID:-}" ] && [ "${VERSION_ID%%.*}" -le 10 ] && echo 1)" && [ -n "$isDebianBusterOrOlder" ]; }; then # prefer iproute2 if it exists iproute=iproute2 - if ! debuerreotype-apt-get "$rootfsDir" install -qq -s iproute2 &> /dev/null; then + if ! debuerreotype-apt-get "$rootfsDir" install -q -s iproute2 &> /dev/null; then # poor wheezy iproute=iproute fi diff --git a/examples/raspbian.sh b/examples/raspbian.sh index 5f3a0629d..4141c0ee3 100755 --- a/examples/raspbian.sh +++ b/examples/raspbian.sh @@ -124,7 +124,7 @@ debuerreotype-init "${initArgs[@]}" "$rootfsDir" "$suite" "$mirror" debuerreotype-minimizing-config "$rootfsDir" # TODO do we need to update sources.list here? (security?) -debuerreotype-apt-get "$rootfsDir" update -qq +debuerreotype-apt-get "$rootfsDir" update -q debuerreotype-recalculate-epoch "$rootfsDir" epoch="$(< "$rootfsDir/debuerreotype-epoch")" @@ -137,9 +137,9 @@ touch_epoch() { aptVersion="$("$debuerreotypeScriptsDir/.apt-version.sh" "$rootfsDir")" if dpkg --compare-versions "$aptVersion" '>=' '1.1~'; then - debuerreotype-apt-get "$rootfsDir" full-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" full-upgrade -yq else - debuerreotype-apt-get "$rootfsDir" dist-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" dist-upgrade -yq fi # copy the rootfs to create other variants @@ -151,7 +151,7 @@ epoch2021="$(date --date '2021-01-01 00:00:00' +%s)" if [ "$epoch" -lt "$epoch2021" ] || { isDebianBusterOrOlder="$([ -f "$rootfsDir/etc/os-release" ] && source "$rootfsDir/etc/os-release" && [ -n "${VERSION_ID:-}" ] && [ "${VERSION_ID%%.*}" -le 10 ] && echo 1)" && [ -n "$isDebianBusterOrOlder" ]; }; then # prefer iproute2 if it exists iproute=iproute2 - if ! debuerreotype-apt-get "$rootfsDir" install -qq -s iproute2 &> /dev/null; then + if ! debuerreotype-apt-get "$rootfsDir" install -q -s iproute2 &> /dev/null; then # poor wheezy iproute=iproute fi diff --git a/examples/steamos.sh b/examples/steamos.sh index 8e0518340..4840b89b0 100755 --- a/examples/steamos.sh +++ b/examples/steamos.sh @@ -98,7 +98,7 @@ debuerreotype-init "${initArgs[@]}" "$rootfsDir" "$suite" "$mirror" debuerreotype-minimizing-config "$rootfsDir" echo "deb $mirror $suite main contrib non-free" | tee "$rootfsDir/etc/apt/sources.list" -debuerreotype-apt-get "$rootfsDir" update -qq +debuerreotype-apt-get "$rootfsDir" update -q debuerreotype-recalculate-epoch "$rootfsDir" epoch="$(< "$rootfsDir/debuerreotype-epoch")" @@ -112,9 +112,9 @@ touch_epoch "$rootfsDir/etc/apt/sources.list" aptVersion="$("$debuerreotypeScriptsDir/.apt-version.sh" "$rootfsDir")" if dpkg --compare-versions "$aptVersion" '>=' '1.1~'; then - debuerreotype-apt-get "$rootfsDir" full-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" full-upgrade -yq else - debuerreotype-apt-get "$rootfsDir" dist-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" dist-upgrade -yq fi # copy the rootfs to create other variants @@ -123,7 +123,7 @@ tar -cC "$rootfsDir" . | tar -xC "$rootfsDir"-slim # prefer iproute2 if it exists iproute=iproute2 -if ! debuerreotype-apt-get "$rootfsDir" install -qq -s iproute2 &> /dev/null; then +if ! debuerreotype-apt-get "$rootfsDir" install -q -s iproute2 &> /dev/null; then # poor wheezy iproute=iproute fi diff --git a/examples/ubuntu.sh b/examples/ubuntu.sh index 5ea8920d5..55bae7a53 100755 --- a/examples/ubuntu.sh +++ b/examples/ubuntu.sh @@ -128,7 +128,7 @@ tee "$rootfsDir/etc/apt/sources.list" <<-EOS deb $secmirror $suite-security main restricted universe multiverse EOS # TODO make components list a script flag? backports? -debuerreotype-apt-get "$rootfsDir" update -qq +debuerreotype-apt-get "$rootfsDir" update -q debuerreotype-recalculate-epoch "$rootfsDir" epoch="$(< "$rootfsDir/debuerreotype-epoch")" @@ -142,9 +142,9 @@ touch_epoch "$rootfsDir/etc/apt/sources.list" aptVersion="$("$debuerreotypeScriptsDir/.apt-version.sh" "$rootfsDir")" if dpkg --compare-versions "$aptVersion" '>=' '1.1~'; then - debuerreotype-apt-get "$rootfsDir" full-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" full-upgrade -yq else - debuerreotype-apt-get "$rootfsDir" dist-upgrade -yqq + debuerreotype-apt-get "$rootfsDir" dist-upgrade -yq fi # copy the rootfs to create other variants @@ -153,7 +153,7 @@ tar -cC "$rootfsDir" . | tar -xC "$rootfsDir"-slim # prefer iproute2 if it exists iproute=iproute2 -if ! debuerreotype-apt-get "$rootfsDir" install -qq -s iproute2 &> /dev/null; then +if ! debuerreotype-apt-get "$rootfsDir" install -q -s iproute2 &> /dev/null; then # poor wheezy iproute=iproute fi diff --git a/scripts/debuerreotype-init b/scripts/debuerreotype-init index 9109bffe7..11bce176c 100755 --- a/scripts/debuerreotype-init +++ b/scripts/debuerreotype-init @@ -167,7 +167,7 @@ if [ -z "$nonDebian" ]; then $([ -z "$debianEol" ] || echo '--eol') \ $([ -z "$debianPorts" ] || echo '--ports') \ "$targetDir" "$suite" - "$thisDir/debuerreotype-apt-get" "$targetDir" update -qq + "$thisDir/debuerreotype-apt-get" "$targetDir" update -q fi # since we're minbase, we know everything included is either essential, or a dependency of essential, so let's get clean "apt-mark showmanual" output diff --git a/scripts/debuerreotype-minimizing-config b/scripts/debuerreotype-minimizing-config index 2eaa7af8a..4d11dd51a 100755 --- a/scripts/debuerreotype-minimizing-config +++ b/scripts/debuerreotype-minimizing-config @@ -37,7 +37,7 @@ EOF chmod 0755 "$targetDir/usr/sbin/policy-rc.d" # prevent upstart scripts from running during install/update (but only if the "upstart" package exists) -if "$thisDir/debuerreotype-chroot" "$targetDir" apt-get install -qq -s upstart &> /dev/null; then +if "$thisDir/debuerreotype-chroot" "$targetDir" apt-get install -q -s upstart &> /dev/null; then "$thisDir/debuerreotype-chroot" "$targetDir" dpkg-divert --local --rename --add /sbin/initctl > /dev/null cp -a "$targetDir/usr/sbin/policy-rc.d" "$targetDir/sbin/initctl" sed -i 's/^exit.*/exit 0/' "$targetDir/sbin/initctl"