From d0d33901f2f07f1bb1e7c765129796be73b27603 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Sun, 24 Jul 2011 22:58:12 +0200 Subject: [PATCH] Switch to live-boot-grml and remove pins --- etc/grml/fai/NFSROOT | 2 +- etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE | 9 --------- etc/grml/fai/config/package_config/GRMLBASE | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/etc/grml/fai/NFSROOT b/etc/grml/fai/NFSROOT index 5404649..c76333c 100644 --- a/etc/grml/fai/NFSROOT +++ b/etc/grml/fai/NFSROOT @@ -8,7 +8,7 @@ dnsutils ntpdate dosfstools xfsprogs xfsdump procinfo dialog discover mdetect kbd expect iproute udev -live-boot +live-boot-grml # needed for the simple examples # cfengine2 libapt-pkg-perl diff --git a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE index d04e4d7..3a82ba6 100644 --- a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE +++ b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE @@ -17,12 +17,3 @@ Pin-Priority: 995 Package: * Pin: origin deb.grml.org Pin-Priority: 994 - -// make sure we never use the version from Debian -Package: live-boot -Pin: origin deb.grml.org -Pin-Priority: 900 - -Package: live-boot-initramfs-tools -Pin: origin deb.grml.org -Pin-Priority: 900 diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE index 61d9017..5caf29d 100644 --- a/etc/grml/fai/config/package_config/GRMLBASE +++ b/etc/grml/fai/config/package_config/GRMLBASE @@ -33,7 +33,7 @@ hwinfo initramfs-tools kbd less -live-boot +live-boot-grml lvm2 mdadm nfs-common -- 2.1.4