projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23d8a40
)
Replace /bin/true with true in chroot-script
author
Ulrich Dangel
<uli@spamt.net>
Sun, 22 Nov 2009 14:24:42 +0000
(15:24 +0100)
committer
Ulrich Dangel
<uli@spamt.net>
Sun, 22 Nov 2009 14:25:09 +0000
(15:25 +0100)
chroot-script
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
d0f71f3
..
9ca8d12
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-51,7
+51,7
@@
chrootmirror() {
if [ -n "$ISO" ] ; then
echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
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
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
# 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
# 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
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
}
fi
done
}