summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-09-25 02:37:31 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2011-09-25 02:37:31 +0200
commit18699011a2fe657f342502839c374b0a5e6452f5 (patch)
tree62ebfcee208783ca0954a8cc3084f4bc16a84c5a
parent8fbf27aa417408a00462e8709b6a32d47f15fc26 (diff)
downloadkanotix-18699011a2fe657f342502839c374b0a5e6452f5.zip
kanotix-18699011a2fe657f342502839c374b0a5e6452f5.tar.gz
removed extra grub2 repository
-rwxr-xr-xauto/config11
-rw-r--r--config/repositories/grub3
-rw-r--r--config/repositories/grub.gpg30
3 files changed, 6 insertions, 38 deletions
diff --git a/auto/config b/auto/config
index 7332025..d6a8dd5 100755
--- a/auto/config
+++ b/auto/config
@@ -12,6 +12,7 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
export LB_PACKAGES_LISTS="kanotix-master"
export LB_BOOTLOADER="syslinux"
export LB_SYSLINUX_MENU_LIVE_ENTRY="Kanotix"
+export LB_LINUX_PACKAGES="linux-image linux-headers"
lb config noauto \
--iso-volume KANOTIX \
@@ -24,7 +25,7 @@ lb config noauto \
--bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \
--distribution squeeze \
--archive-areas "main contrib non-free" \
- --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa firefox grub" \
+ --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa firefox" \
--security true \
--checksums md5 \
--syslinux-timeout 5 \
@@ -52,15 +53,15 @@ lb config noauto \
case $LB_ARCHITECTURE in
"amd64")
lb config noauto \
- --linux-flavours generic \
- --linux-packages "linux-image-3.0.0-11 linux-headers-3.0.0-11"
+ --linux-flavours generic
+ #--linux-packages "linux-image linux-headers"
#--linux-flavours amd64 \
#--linux-packages "linux-image-2.6 linux-headers-2.6"
;;
"i386")
lb config noauto \
- --linux-flavours generic \
- --linux-packages "linux-image-3.0.0-11 linux-headers-3.0.0-11"
+ --linux-flavours generic
+ #--linux-packages "linux-image linux-headers"
#--linux-flavours 686-bigmem \
#--linux-packages "linux-image-2.6 linux-headers-2.6"
;;
diff --git a/config/repositories/grub b/config/repositories/grub
deleted file mode 100644
index 7f84c01..0000000
--- a/config/repositories/grub
+++ /dev/null
@@ -1,3 +0,0 @@
-# Grub2
-deb http://kanotix.com/files/fix/grub2.squeeze ./
-deb-src http://kanotix.com/files/fix/grub2.squeeze ./
diff --git a/config/repositories/grub.gpg b/config/repositories/grub.gpg
deleted file mode 100644
index 051af27..0000000
--- a/config/repositories/grub.gpg
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEbWErMRBACOPf61a+Of7/kfSx1djy8DEiyDa9ESx6nNnIaPy4agExu1XJdk
-oWzVKqZlZuC8TEhjV+L8RpStBPdVxUuspASZtqEcJVF9viZtMzK2NTVR2bKtFNfj
-OBRK3CAcHjhne0HCGPN7k2Tw2qW/jxucSdbw+0DKeRZBA1G4OS+0qWubbwCg1GVi
-OXgXoeoHp9fAmRYKpfkLx3UD/2bLTanQ3vmdmYGgW6rCSTrackolYjUD9Qs5KPXT
-jTC77Bti2SCJvO+aao4sl8QrkejmrtLmTGIQj3wWsQLk2KQwt593Xn9KZy6kokvQ
-rkMcpqh/J5zxZF3xSLkIBXfZOsKeRj1U4MdGg25GeUG5k7xLUaaoqNWHZdPwJe0s
-n7tJA/9WYaqHWcT/txpXkxg6HXA1ZadF86KxDV4uiccQMxDeURn0gmN51FSoexoI
-EFxzLLeTvvqMLWIUGsv5Vn1aTYhoBOSw9XnO3o0a+G5Iwg9RPa2ovRLRJ94f8kgk
-hDFL6ELroQPH522UNF8vNO8S+3ADWjPfTwjiVSs9a1aFwCV9mLQqS2Fub3RpeCAo
-VGhvcmhhbW1lcikgPG5vcmVwbHlAa2Fub3RpeC5jb20+iGAEExECACACGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAUCSfSlhgAKCRDSDW5vauzFPRlAAJ97OIJp57Vk
-qX0gsM3hBmkjWoSqrwCcDw/XKEp3BmxFpEa4JHIiyr9aQZ25Ag0ERtYStRAIALIx
-U9baoSsUuNtyOTS9vGvy4uKo34/XMSSLMCAWKSBHXZ5p2fFRfmTymoZpjl8OLpeq
-L/b9IyWbd0LnFLWT8pMXvNAoL6dwWermnmW0gONxb9zLBHcFfANoa6epcpG1NkWC
-Wyujjcaf5i8wcUexsGNTrTQXZGq5KNtyRnscONfwB+tmH15YZgU3JwlnVlAV67Qo
-zkktDqeyKGDNDkJJbEfIXIwQ0zMSGapzYoLpX1KtPqDjSX/Hzb56FN9mUX/qDtpJ
-iKLSluuXbG9NwsBowfAyX4yJa3LkiABR4ZmqW8qSkV15tZRsJS+JyqP5ni5WZrcs
-PmivpmIX0j52ytORtqMAAwYH/1dwmOJQyyZwiRsC09gnZjqBv+S/Yw3yFfjFjhaY
-AqTQ0Whq5ptQLZBMQDHV7+VuEBghvPe6P+OoU3QorZ6HdHnwQkaU7z6olmRplYLj
-mGgMGpIpzhpFNuBWmvYePvDTQWpe/Je6KL55kiGrGQCknnC4458DWEld0h0fbiDG
-YWAR7F4dZ7CRHJgTjof9nOeQVnSfqYkXWkfbqAjDSrxZoyTr0dSYpKjgRwr3c6TM
-hBSSiMYW6S0ZknA+hG5SKmoyBeVRCT6FDErYYfP3d7ZqpZ08DmTjrnB1H8Qj+Sda
-26m9UqMdhmwpp2DPp3A5GmKqzbNRH5xnPGlOriotbnsvIauITwQYEQIADwUCRtYS
-tQIbDAUJAeEzgAAKCRDSDW5vauzFPfaNAJ0bvj0+YPKUe45fdCiRRWPOSej0ZACf
-XaCZ+2zAh156vgAAfkPqU5FHg/8=
-=fxFL
------END PGP PUBLIC KEY BLOCK-----