Switch to live-boot-grml and remove pins

diff --git a/etc/grml/fai/NFSROOT b/etc/grml/fai/NFSROOT
index 5404649..c76333c 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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