From d5677efc0631e9efb04d666e36cd90f531b8bab5 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Mon, 6 Dec 2010 22:18:29 +0100 Subject: [PATCH] remove obsolete live.conf live-initramfs-grml ships this very same live.conf since August 2008. Dropping it from grml-live, as live-boot-grml no longer uses live.conf. --- etc/grml/fai/config/files/etc/live.conf/GRMLBASE | 49 ---------------------- .../fai/config/scripts/GRMLBASE/10-build-initramfs | 1 - 2 files changed, 50 deletions(-) delete mode 100644 etc/grml/fai/config/files/etc/live.conf/GRMLBASE diff --git a/etc/grml/fai/config/files/etc/live.conf/GRMLBASE b/etc/grml/fai/config/files/etc/live.conf/GRMLBASE deleted file mode 100644 index a50296e..0000000 --- a/etc/grml/fai/config/files/etc/live.conf/GRMLBASE +++ /dev/null @@ -1,49 +0,0 @@ -################################################################## -# Notice: this file is NOT the official configuration file of -# the Debian package live-initramfs but instead is installed by -# /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs -################################################################## - -# /etc/live.conf - configuration file for live-initramfs(7) - -# We have a Debian based system of course: -export BUILD_SYSTEM="Debian" - -# grml specific settings: -export USERNAME="grml" -export USERFULLNAME="grml user" -export HOSTNAME="grml" - -# disable "mount failed for selinuxfs on /selinux" warning message: -export SELINUX_INIT="No" -# unionfs or aufs? -export UNIONTYPE="aufs" - -#export NOAUTOLOGIN="Yes" -#export NOFASTBOOT="Yes" -#export NOSUDO="Yes" -#export NOUSER="Yes" -#export NOXAUTOCONFIG="Yes" -#export NOFSTAB="Yes" -#export NOHOSTS="Yes" -#export NOPERSISTENT="Yes" -#export NOACCESSIBILITY="Yes" -#export NOAPPARMOR="Yes" -#export NOAPTCDROM="Yes" -#export NOCONSOLEKEYBOARD="Yes" -#export NOGNOMEPANEL="Yes" -#export NOKPERSONALIZER="Yes" -#export NOKWALLET="Yes" -#export NOLANGUAGESELECTOR="Yes" -#export NOLOCALES="Yes" -#export NONETWORKING="Yes" -#export NOPOWERMANAGEMENT="Yes" -#export NOPRESEED="Yes" -#export NOPROGRAMCRASHES="Yes" -#export NORESTRICTEDMANAGER="Yes" -#export NOTIMEZONE="Yes" -#export NOUPDATENOTIFIER="Yes" -#export NOXAUTOLOGIN="Yes" -#export NOXSCREENSAVER="Yes" - -# EOF diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs index ad017fa..c3ed4ea 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs @@ -8,7 +8,6 @@ set -e -fcopy /etc/live.conf fcopy /usr/share/initramfs-tools/scripts/init-top/grml FILE=$(ls -1 $target/boot/vmlinuz-* 2>/dev/null| sort -r | head -1) -- 2.1.4