buildd: follow symlinks to archive and dump the log files they point to.

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 10f4279..230fe50 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -429,7 +429,7 @@ case $SUITE in
    *) echo "Sorry, $SUITE is not a valid Debian suite, exiting.">&2; bailout 1 ;;
 esac
 
-DIST=" etch\| stable\| lenny\| squeeze\| testing\| sid\| unstable"
+DIST=" etch\| stable\| lenny\| squeeze\| wheezy\| testing\| sid\| unstable"
 sed "s/\(^deb .\+\)\([ \t]*\)\($DIST\)\([ \t]*\)\(main \)/\1 \2$SUITE\4\5/" "$SOURCES_LIST_FILE" | sponge "$SOURCES_LIST_FILE"
 for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
     if [ -n "$file" ] ; then
@@ -1126,11 +1126,11 @@ else
            einfo "Creating hybrid ISO file with manifold method"
            if [ "$HYBRID_METHOD" = "grub2" ] ; then
                # 512 bytes: MBR, partition table, load GRUB 2
-               echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32
+               echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 1:0x96 -g $cyls:16:32
            else
               # read only one but 2048-byte sized (scale: << 2) sector
               echo $bootoff $bootoff | \
-                 mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
+                 mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 1:0x96 -g $cyls:16:32 -S 2
            fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
            eend $?
          fi