X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=95e3dabad22ea898b81dac98635e4f78a5c116db;hp=6c3c5496c44c0a795a2619a0b40fbec2a18f96de;hb=2017df2408d7a815e4594d93501e3253b8d799ca;hpb=cb5e98b9863e256b40ca8c58dc678cbcce698d4f

diff --git a/grml-live b/grml-live
index 6c3c549..95e3dab 100755
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.13.3'
+GRML_LIVE_VERSION='0.14.0'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
@@ -439,7 +439,7 @@ for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
 done
 
 # notice: activate grml-live pool only if we are building against unstable:
-if grep -qe unstable -qe sid "$SOURCES_LIST_FILE" ; then
+if grep -qwe unstable -qwe sid "$SOURCES_LIST_FILE" ; then
    grep -q 'grml-live.*main' "$SOURCES_LIST_FILE" || \
    grep grml-stable "$SOURCES_LIST_FILE" | \
         sed 's/grml-stable/grml-live/' >> "$SOURCES_LIST_FILE"
@@ -1127,11 +1127,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 1:0x96 -g $cyls:16:32
+               echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4: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 1:0x96 -g $cyls:16:32 -S 2
+                 mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
            fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
            eend $?
          fi