From f9e99174221e1035d0eec78ff68d0c65bdc3fba4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 19 Sep 2007 13:12:46 +0200 Subject: [PATCH] Unify classes --- etc/grml/fai/config/class/GRML_X.var | 21 --------------------- etc/grml/fai/config/class/XORG.var | 21 --------------------- etc/grml/fai/config/package_config/GRML_X | 17 ----------------- etc/grml/fai/config/package_config/XORG | 5 ----- .../config/scripts/{GRML_X => GRMLBASE}/32-xorg | 2 +- .../config/scripts/GRMLBASE/90-update-alternatives | 8 ++++++++ .../fai/config/scripts/GRMLBASE/98-clean-chroot | 14 ++++++++++++++ .../fai/config/scripts/GRML_SMALL/98-clean-chroot | 22 ---------------------- .../config/scripts/GRML_X/90-update-alternatives | 22 ---------------------- 9 files changed, 23 insertions(+), 109 deletions(-) delete mode 100644 etc/grml/fai/config/class/GRML_X.var delete mode 100644 etc/grml/fai/config/class/XORG.var delete mode 100644 etc/grml/fai/config/package_config/GRML_X delete mode 100644 etc/grml/fai/config/package_config/XORG rename etc/grml/fai/config/scripts/{GRML_X => GRMLBASE}/32-xorg (91%) delete mode 100755 etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot delete mode 100755 etc/grml/fai/config/scripts/GRML_X/90-update-alternatives diff --git a/etc/grml/fai/config/class/GRML_X.var b/etc/grml/fai/config/class/GRML_X.var deleted file mode 100644 index 5bb0c7a..0000000 --- a/etc/grml/fai/config/class/GRML_X.var +++ /dev/null @@ -1,21 +0,0 @@ -# default values for installation. You can override them in your *.var files - -# allow installation of packages from unsigned repositories -FAI_ALLOW_UNSIGNED=1 - -CONSOLEFONT= -KEYMAP=us-latin1 - -# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not. -UTC=yes -TIMEZONE=Europe/Vienna - -# root password for the new installed linux system; md5 and crypt are possible -# pw is "fai" -ROOTPW='x' - -# MODULESLIST contains modules that will be loaded by the new system, -# not during installation these modules will be written to /etc/modules -# If you need a module during installation, add it to $kernelmodules -# in 20-hwdetect.source. But discover should do most of this job -# MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse" diff --git a/etc/grml/fai/config/class/XORG.var b/etc/grml/fai/config/class/XORG.var deleted file mode 100644 index 5bb0c7a..0000000 --- a/etc/grml/fai/config/class/XORG.var +++ /dev/null @@ -1,21 +0,0 @@ -# default values for installation. You can override them in your *.var files - -# allow installation of packages from unsigned repositories -FAI_ALLOW_UNSIGNED=1 - -CONSOLEFONT= -KEYMAP=us-latin1 - -# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not. -UTC=yes -TIMEZONE=Europe/Vienna - -# root password for the new installed linux system; md5 and crypt are possible -# pw is "fai" -ROOTPW='x' - -# MODULESLIST contains modules that will be loaded by the new system, -# not during installation these modules will be written to /etc/modules -# If you need a module during installation, add it to $kernelmodules -# in 20-hwdetect.source. But discover should do most of this job -# MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse" diff --git a/etc/grml/fai/config/package_config/GRML_X b/etc/grml/fai/config/package_config/GRML_X deleted file mode 100644 index b5efbc2..0000000 --- a/etc/grml/fai/config/package_config/GRML_X +++ /dev/null @@ -1,17 +0,0 @@ -PACKAGES aptitude - -dillo -fluxbox -gkrellm -grml-ddcxinfo -grml-desktop -grml-x -vim-gtk -xfonts-100dpi -xfonts-75dpi -xfonts-base -xorg -xserver-xorg-input-all -xserver-xorg-input-vmmouse -xserver-xorg-video-all -xterm xcursor-themes diff --git a/etc/grml/fai/config/package_config/XORG b/etc/grml/fai/config/package_config/XORG deleted file mode 100644 index cfe06c0..0000000 --- a/etc/grml/fai/config/package_config/XORG +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGES aptitude -xorg xserver-xorg-video-all xserver-xorg-input-all -ttf-freefont type1inst -xscreensaver -xscreensaver-gl diff --git a/etc/grml/fai/config/scripts/GRML_X/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg similarity index 91% rename from etc/grml/fai/config/scripts/GRML_X/32-xorg rename to etc/grml/fai/config/scripts/GRMLBASE/32-xorg index bc89808..60d61dc 100755 --- a/etc/grml/fai/config/scripts/GRML_X/32-xorg +++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg @@ -1,5 +1,5 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML_X/32-xorg +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/32-xorg # Purpose: make sure there does not exist /etc/X11/xorg.conf by default # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index ba17d88..7825cab 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -14,5 +14,13 @@ if [ -r $target/usr/bin/vim.basic ] ; then $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic fi +if [ -r $target/usr/bin/xterm ] ; then + $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm +fi + +if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then + $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme +fi + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index 02665f6..e66fcf7 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -10,6 +10,8 @@ set -u set -e +# TODO: use extra files and class names instead of environment variabes + # supported environment variables for grml_cleanup_chroot: # NOCOLORS: if set it disables colors in (debugging) output # LATEX_CLEANUP: remove some big directories of texlive (/usr/share/doc/texlive-*) @@ -17,6 +19,18 @@ set -e # FAST: skip some longer tasks # REMOVE_DOCS: rm -rf /usr/share/doc + /usr/share/info +if ifclass GRML_SMALL ; then + cp /etc/grml/fai/grml/grml_cleanup_chroot.small $target/root/ + $ROOTCMD sh -c "NOCOLORS=1 /root/grml_cleanup_chroot.small" + rm $target/root/grml_cleanup_chroot.small +fi + +if ifclass REMOVE_DOCS ; then + $ROOTCMD sh -c "NOCOLORS=1 REMOVE_DOCS=1 /root/grml_cleanup_chroot.small" + rm $target/root/grml_cleanup_chroot.small +fi + +# final cleanup cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/ $ROOTCMD sh -c "NOCOLORS=1 /root/grml_cleanup_chroot" rm $target/root/grml_cleanup_chroot diff --git a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot deleted file mode 100755 index 1ff34af..0000000 --- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot -# Purpose: clean up chroot system -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Sep 17 17:36:11 CEST 2007 [mika] -################################################################################ - -set -u -set -e - -# supported environment variables of grml_cleanup_chroot.small: -# NOCOLORS: if set it disables colors in (debugging) output -# REMOVE_DOCS: rm -rf /usr/share/doc + /usr/share/info - -cp /etc/grml/fai/grml/grml_cleanup_chroot.small $target/root/ -$ROOTCMD sh -c "NOCOLORS=1 /root/grml_cleanup_chroot.small" -rm $target/root/grml_cleanup_chroot.small - -## END OF FILE ################################################################# -# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 diff --git a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives b/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives deleted file mode 100755 index 33ac271..0000000 --- a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML_X/90-update-alternatives -# Purpose: set up /etc/alternatives/* according to grml preferences -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Sep 16 23:18:02 CEST 2007 [mika] -################################################################################ - -set -u -set -e - -if [ -r $target/usr/bin/xterm ] ; then - $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm -fi - -if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then - $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme -fi - -## END OF FILE ################################################################# -# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 -- 2.1.4