projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
97a700a
)
Fix syntax error in chroot-script
author
Michael Prokop
<mika@grml.org>
Mon, 23 Apr 2007 10:02:10 +0000
(12:02 +0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 23 Apr 2007 10:02:10 +0000
(12:02 +0200)
chroot-script
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
4807303
..
bc93353
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Mon Apr 23 1
1:51:59
CEST 2007 [mika]
+# Latest change: Mon Apr 23 1
2:02:03
CEST 2007 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
@@
-70,8
+70,10
@@
EOF
gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure
# why it's necessary, sometimes we get an error even though it works [mika]
gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure
# why it's necessary, sometimes we get an error even though it works [mika]
- if grep -q grml /etc/apt/preferences 2>/dev/null ; then
- cat >> /etc/apt/preferences >> EOF
+ # make sure we install packages from grml's pool only if not available
+ # from Debian!
+ if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then
+ cat >> /etc/apt/preferences << EOF
// debian pool (default):
Package: *
Pin: release o=Debian
// debian pool (default):
Package: *
Pin: release o=Debian
@@
-82,6
+84,7
@@
Package: *
Pin: origin deb.grml.org
Pin-Priority: 991
EOF
Pin: origin deb.grml.org
Pin-Priority: 991
EOF
+ fi
fi
}
# }}}
fi
}
# }}}