X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=3866136f3d74229f6725b1db157e8274de4fa41a;hp=bb4fc528700d065720ca8058526687c72ba11710;hb=29c3663a3e3dc332e90c7d861b50656952ecd94c;hpb=5a34b68a19b65b3a9e119b70095c8a2355e83592

diff --git a/grml-live b/grml-live
index bb4fc52..3866136 100755
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.13.2'
+GRML_LIVE_VERSION='0.14.1'
 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