X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=9ca8d1297a43a0db5028c42603807c3c52672802;hp=d0f71f366b9dc122e47705e9c9ca1293ab62fec3;hb=94e9a430bf4ae6728eee13b9be46d4d67d0efd87;hpb=23d8a40f603c7abf0a4eb1cbf3259a6789b66214 diff --git a/chroot-script b/chroot-script index d0f71f3..9ca8d12 100755 --- a/chroot-script +++ b/chroot-script @@ -51,7 +51,7 @@ chrootmirror() { if [ -n "$ISO" ] ; then echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list - [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || /bin/true + [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true else if [ -n "$MIRROR" ] ; then echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list @@ -80,7 +80,7 @@ EOF # make sure we have the keys available for aptitude gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 - gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure + gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure # why it's necessary, sometimes we get an error even though it works [mika] # make sure we install packages from grml's pool only if not available @@ -399,7 +399,7 @@ custom_scripts() { services() { for service in ssh mdadm mdadm-raid ; do if [ -x /etc/init.d/"$service" ] ; then - /etc/init.d/"$service" stop || /bin/true + /etc/init.d/"$service" stop || true fi done }