X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=04b30bb5acaa13e619826d93145ac4f36792e9e0;hp=362f88cb0cb8e6766d3f62002081f146905f8282;hb=b97721f7f383f030396fa41bab2c80e5151cdda1;hpb=b63a5f16ac3f03eb93220fd26ab188e50314f5d0 diff --git a/grml-live b/grml-live index 362f88c..04b30bb 100755 --- a/grml-live +++ b/grml-live @@ -149,6 +149,7 @@ umount_all() { umount $CHROOT_OUTPUT/sys 2>/dev/null || /bin/true umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true + umount "${CHROOT_OUTPUT}/grml-live/sources/" 2>/dev/null || /bin/true [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" } # }}} @@ -538,9 +539,14 @@ $GRML_LIVE_SOURCES" | \ else cat >> "$SOURCES_LIST_OUTPUT" << EOF # generated by grml-live -deb http://deb.grml.org/ grml-stable main -deb http://deb.grml.org/ grml-testing main -deb http://cdn.debian.net/debian $SUITE main contrib non-free +deb http://deb.grml.org/ grml-stable main +deb-src http://deb.grml.org/ grml-stable main + +deb http://deb.grml.org/ grml-testing main +deb-src http://deb.grml.org/ grml-testing main + +deb http://cdn.debian.net/debian $SUITE main contrib non-free +deb-src http://cdn.debian.net/debian $SUITE main contrib non-free EOF fi @@ -626,6 +632,9 @@ else mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}" fi + mkdir -p "${OUTPUT}/grml_sources/" "${CHROOT_OUTPUT}/grml-live/sources/" + mount --bind "${OUTPUT}/grml_sources/" "${CHROOT_OUTPUT}/grml-live/sources/" + # tell dpkg to use "unsafe io" during the build [ -d "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d" ] || mkdir -p "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d" echo force-unsafe-io > "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d/unsafe-io"