projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No longer bootstrap with --no-merged-usr
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
6710037
..
65c9417
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-712,7
+712,7
@@
if [ -z "$FAI_DEBOOTSTRAP" ] ; then
fi
if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
fi
if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
- FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH
--no-merged-usr
"
+ FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH"
fi
# create backup of old (not yet automatically generated) config file
fi
# create backup of old (not yet automatically generated) config file