Mercurial
grml-live / changeset
summary | shortlog | changelog | tags | manifest | changeset | raw | bz2 | zip | gz

Warning!

Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!

Unify classes
authorMichael Prokop
Wed Sep 19 13:12:46 2007 +0200 (14 months ago)
changeset 9053d9a17dadb2
manifest53d9a17dadb2
parent 89ad3f85ce7460
child 91fcc52be457e9
Unify classes
etc/grml/fai/config/class/GRML_X.varfile | annotate | diff | revisions
etc/grml/fai/config/class/XORG.varfile | annotate | diff | revisions
etc/grml/fai/config/package_config/GRML_Xfile | annotate | diff | revisions
etc/grml/fai/config/package_config/XORGfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRMLBASE/32-xorgfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRMLBASE/90-update-alternativesfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chrootfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chrootfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRML_X/32-xorgfile | annotate | diff | revisions
etc/grml/fai/config/scripts/GRML_X/90-update-alternativesfile | annotate | diff | revisions
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives	Wed Sep 19 12:23:55 2007 +0200

+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives	Wed Sep 19 13:12:46 2007 +0200

@@ -14,5 +14,13 @@ if [ -r $target/usr/bin/vim.basic ] ; th

    $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

--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot	Wed Sep 19 12:23:55 2007 +0200

+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot	Wed Sep 19 13:12:46 2007 +0200

@@ -10,6 +10,8 @@ set -u

 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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg	Wed Sep 19 13:12:46 2007 +0200

@@ -0,0 +1,18 @@

+#!/bin/sh

+# 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 <mika@grml.org>

+# 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:17:08 CEST 2007 [mika]

+################################################################################

+

+set -u

+set -e

+

+if [ -r "$target/etc/X11/xorg.conf" ] ; then

+   mv -f "$target"/etc/X11/xorg.conf "$target"/etc/X11/xorg.conf.debian

+fi

+

+## END OF FILE #################################################################

+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

--- a/etc/grml/fai/config/class/GRML_X.var	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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"

--- a/etc/grml/fai/config/class/XORG.var	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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"

--- a/etc/grml/fai/config/package_config/GRML_X	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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

--- a/etc/grml/fai/config/package_config/XORG	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -1,5 +0,0 @@

-PACKAGES aptitude

-xorg xserver-xorg-video-all xserver-xorg-input-all

-ttf-freefont type1inst

-xscreensaver

-xscreensaver-gl

--- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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 <mika@grml.org>

-# 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

--- a/etc/grml/fai/config/scripts/GRML_X/32-xorg	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -1,18 +0,0 @@

-#!/bin/sh

-# Filename:      /etc/grml/fai/config/scripts/GRML_X/32-xorg

-# Purpose:       make sure there does not exist /etc/X11/xorg.conf by default

-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>

-# 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:17:08 CEST 2007 [mika]

-################################################################################

-

-set -u

-set -e

-

-if [ -r "$target/etc/X11/xorg.conf" ] ; then

-   mv -f "$target"/etc/X11/xorg.conf "$target"/etc/X11/xorg.conf.debian

-fi

-

-## END OF FILE #################################################################

-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

--- a/etc/grml/fai/config/scripts/GRML_X/90-update-alternatives	Wed Sep 19 12:23:55 2007 +0200

+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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 <mika@grml.org>

-# 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
grml-live