From 7cf0807c369e63faf122a7cca15f6835efd1d988 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Fri, 4 Mar 2011 16:04:17 +0100
Subject: 32/64bit labels
---
auto/build | 6 +++++-
auto/config | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/auto/build b/auto/build
index 733e76c..4a3745c 100755
--- a/auto/build
+++ b/auto/build
@@ -4,7 +4,8 @@
. config/common
. config/kanotix
bit=32
-[ "$LB_ARCHITECTURE" = "amd64" ] && bit=64
+LABEL=Kanotix
+[ "$LB_ARCHITECTURE" = "amd64" ] && bit=64 && LABEL=${LABEL}64
# Update kanotix-version (32/64-bit and timestamp)
[ ! -f config/chroot_local-includes/etc/kanotix-version ] && echo "Kanotix Hellfire 0000-00:00" > config/chroot_local-includes/etc/kanotix-version
@@ -36,11 +37,14 @@ prebuild()
mv cache/stages_bootstrap cache/stages_bootstrap$bsbit
fi
[ -d cache/stages_bootstrap$bit ] && mv cache/stages_bootstrap$bit cache/stages_bootstrap
+ rm -f kanotix$bit.iso
+ echo "LB_SYSLINUX_MENU_LIVE_ENTRY=\"$LABEL\"" >> config/binary
}
postbuild()
{
[ -d cache/stages_bootstrap ] && mv cache/stages_bootstrap cache/stages_bootstrap$bit
+ [ -f binary-hybrid.iso ] && mv -f binary-hybrid.iso kanotix$bit.iso
}
if [ "$LB_KANOTIX_TMPFS" = "true" ]; then
diff --git a/auto/config b/auto/config
index c8da5ec..eb71a59 100755
--- a/auto/config
+++ b/auto/config
@@ -8,8 +8,9 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
. auto/kanotix
-# preset default packages list
+# preset kanotix defaults
export LB_PACKAGES_LISTS="kanotix-master"
+export LB_SYSLINUX_MENU_LIVE_ENTRY="Kanotix"
lb config noauto \
--iso-volume KANOTIX \
--
cgit v1.0