From 43ea7e244cc988c0393242c03c6d34b07c01ef08 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 3 Dec 2021 10:38:48 +0100 Subject: [PATCH] Drop leftover KEYRING code KEYRING is no longer relevant and a leftover from commit 06fc8bd266ad5. If someone wants to customize the keyring handling of debootstrap, this can be achieved via --debopt / DEBOOTSTRAP_OPT. Closes: grml/grml-debootstrap#184 --- grml-debootstrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grml-debootstrap b/grml-debootstrap index 1f4fa00..2219b7b 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -1635,15 +1635,15 @@ debootstrap_system() { if [ -n "$ISO" ] ; then einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${ISO}" - einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO" + einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO" # shellcheck disable=SC2086 - "$DEBOOTSTRAP" $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$ISO" + "$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$ISO" RC=$? else einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}" - einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR" + einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR" # shellcheck disable=SC2086 - "$DEBOOTSTRAP" $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR" + "$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR" RC=$? fi -- 2.1.4