Rename class GRML into GRMLBASE and update all files according.
authorMichael Prokop <devnull@localhost>
Mon, 17 Sep 2007 11:36:29 +0000 (13:36 +0200)
committerMichael Prokop <devnull@localhost>
Mon, 17 Sep 2007 11:36:29 +0000 (13:36 +0200)
This should allow us much easier handling of different grml flavours.

27 files changed:
docs/grml-live.txt
etc/grml/fai/config/class/GRMLBASE.var [moved from etc/grml/fai/config/class/GRML.var with 100% similarity]
etc/grml/fai/config/class/GRML_FULL.var [new file with mode: 0644]
etc/grml/fai/config/class/GRML_POWERPC.var [new file with mode: 0644]
etc/grml/fai/config/class/GRML_SMALL.var [new file with mode: 0644]
etc/grml/fai/config/class/GRML_X.var [new file with mode: 0644]
etc/grml/fai/config/class/XORG.var [new file with mode: 0644]
etc/grml/fai/config/debconf/GRMLBASE [moved from etc/grml/fai/config/debconf/GRML with 100% similarity]
etc/grml/fai/config/hooks/instsoft.GRMLBASE [moved from etc/grml/fai/config/hooks/instsoft.GRML with 100% similarity]
etc/grml/fai/config/package_config/DEFAULT
etc/grml/fai/config/package_config/GRMLBASE [moved from etc/grml/fai/config/package_config/GRML with 93% similarity]
etc/grml/fai/config/package_config/GRML_SMALL [new file with mode: 0644]
etc/grml/fai/config/scripts/GRMLBASE/05-hostname [moved from etc/grml/fai/config/scripts/GRML/05-hostname with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs [moved from etc/grml/fai/config/scripts/GRML/10-build-initramfs with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup [moved from etc/grml/fai/config/scripts/GRML/15-initsetup with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/20-sudo [moved from etc/grml/fai/config/scripts/GRML/20-sudo with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/21-usersetup [moved from etc/grml/fai/config/scripts/GRML/21-usersetup with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/25-locales [moved from etc/grml/fai/config/scripts/GRML/25-locales with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/30-fstab [moved from etc/grml/fai/config/scripts/GRML/30-fstab with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/31-motd [moved from etc/grml/fai/config/scripts/GRML/31-motd with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup [moved from etc/grml/fai/config/scripts/GRML/33-aptsetup with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/34-hosts [moved from etc/grml/fai/config/scripts/GRML/34-hosts with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/35-network [moved from etc/grml/fai/config/scripts/GRML/35-network with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives [moved from etc/grml/fai/config/scripts/GRML/90-update-alternatives with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot [moved from etc/grml/fai/config/scripts/GRML/98-clean-chroot with 100% similarity]
etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build [moved from etc/grml/fai/config/scripts/GRML/99-finish-grml-build with 100% similarity]
etc/zsh/completion.d/_grml-live

index 2183a21..9bb6948 100644 (file)
@@ -47,8 +47,8 @@ Options
   -c **CLASSES**::
 
 Specify the CLASSES to be used for building the ISO via fai.  By default only
-the classes GRML and I386 are assumed, resulting in a small base system (being
-about ~150MB ISO size).
+the classes GRMLBASE and I386 are assumed, resulting in a small base system
+(being about ~150MB ISO size).
 
   -t **TARGET_DIRECTORY**::
 
@@ -87,26 +87,26 @@ grml-live uses FAI and its class based concept for adjusting configuration
 according to your needs. This gives you flexibility and strength without losing
 the simplicity in the build process.
 
-The main and base class provided by grml-live is named GRML. It's strongly
-recommended to **always** use the class GRML when building an ISO using
+The main and base class provided by grml-live is named GRMLBASE. It's strongly
+recommended to **always** use the class GRMLBASE when building an ISO using
 grml-live as well as the architecture dependend class (being 'I386' for x86_32
 currently only). The following files and directories are relevant for class GRML
 by default:
 
-  /etc/grml/fai/config/scripts/GRML/
-  /etc/grml/fai/config/debconf/GRML
-  /etc/grml/fai/config/class/GRML.var
-  /etc/grml/fai/config/hooks/instsoft.GRML
-  /etc/grml/fai/config/package_config/GRML
+  /etc/grml/fai/config/scripts/GRMLBASE/
+  /etc/grml/fai/config/debconf/GRMLBASE
+  /etc/grml/fai/config/class/GRMLBASE.var
+  /etc/grml/fai/config/hooks/instsoft.GRMLBASE
+  /etc/grml/fai/config/package_config/GRMLBASE
 
 Take a look at the next section for information about the concept of those
 files/directories.
 
 If you want to use your own configuration, extend an existing configuration
 and/or add additional packages to your ISO just invent a new class. For example
-if you want to use your own class named "FOOBAR" just extend CLASSES="GRML" inside
-/etc/grml/grml-live.conf to CLASSES="GRML,FOOBAR" or invoke grml-live using
-the classes option: "grml-live -c GRML,FOOBAR ...".
+if you want to use your own class named "FOOBAR" just extend CLASSES="GRMLBASE"
+inside /etc/grml/grml-live.conf to CLASSES="GRMLBASE,FOOBAR" or invoke grml-live
+using the classes option: "grml-live -c GRMLBASE,FOOBAR ...".
 
 More details regarding the class concept can be found in the documentation of
 FAI (available at /usr/share/doc/fai-doc/).
@@ -173,12 +173,12 @@ installation process.
 
 File with lists of software packages to be installed or removed.  The different
 classes describe what should find its way to your ISO.  When running 'fai -v -C
-/etc/grml/fai -cGRML dirinstall ...' only the files from the directory GRML/
-will be taken, if you use 'fai -v -C /etc/grml/fai -cGRML,FOOBAR dirinstall ...'
-then the files of GRML/ **plus** the files from FOOBAR/ will be taken. So just
-create a new class to adjust it to your needs. Please notice that the directory
-GRML contains a package list defining a minimum but still reasonable package
-configuration.
+/etc/grml/fai -cGRMLBASE dirinstall ...' only the files from the directory GRML/
+will be taken, if you use 'fai -v -C /etc/grml/fai -cGRMLBASE,FOOBAR dirinstall
+...' then the files of GRML/ **plus** the files from FOOBAR/ will be taken. So
+just create a new class to adjust it to your needs. Please notice that the
+directory GRML contains a package list defining a minimum but still reasonable
+package configuration.
 
   /etc/grml/fai/config/scripts/
 
diff --git a/etc/grml/fai/config/class/GRML_FULL.var b/etc/grml/fai/config/class/GRML_FULL.var
new file mode 100644 (file)
index 0000000..5bb0c7a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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/GRML_POWERPC.var b/etc/grml/fai/config/class/GRML_POWERPC.var
new file mode 100644 (file)
index 0000000..5bb0c7a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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/GRML_SMALL.var b/etc/grml/fai/config/class/GRML_SMALL.var
new file mode 100644 (file)
index 0000000..5bb0c7a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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/GRML_X.var b/etc/grml/fai/config/class/GRML_X.var
new file mode 100644 (file)
index 0000000..5bb0c7a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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
new file mode 100644 (file)
index 0000000..5bb0c7a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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"
index 870ae83..4698b47 100644 (file)
@@ -10,9 +10,6 @@ PACKAGES aptitude AMD64
 inux-image-amd64
 memtest86+
 
-PACKAGES aptitude DHCPC
-dhcp3-client
-
 PACKAGES aptitude GRUB
 grub lilo-
 
similarity index 93%
rename from etc/grml/fai/config/package_config/GRML
rename to etc/grml/fai/config/package_config/GRMLBASE
index 45b11a7..2e505c6 100644 (file)
@@ -8,7 +8,6 @@ cron
 dctrl-tools
 debconf-utils
 deborphan
-discover
 eject
 file
 grml
@@ -43,29 +42,22 @@ grml-vpn
 hdparm
 htop
 hwinfo
-idesk
 iptstate
 less
-linuxlogo
 live-initramfs
 locales
 lvm2
 mdadm
 multitail
 nfs-common
-nscd
 openssh-client openssh-server
 pciutils usbutils
 postfix
-rdate
 resolvconf
-rsh-client
 rsync
 strace
 syslog-ng
 sysutils
-tcsh
-time
 usbutils
 wireless-tools wpasupplicant
 
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
new file mode 100644 (file)
index 0000000..10abbda
--- /dev/null
@@ -0,0 +1,192 @@
+PACKAGES aptitude
+
+acpid
+adduser
+agrep
+apt
+atftp
+atftpd
+attr
+bash
+bing
+binutils
+bridge-utils
+bsdmainutils
+bsdutils
+buffer
+busybox
+bzip2
+chntpw
+console-common
+console-terminus
+console-tools
+coreutils
+cpio
+cron
+cryptsetup
+dante-client
+dash
+dctrl-tools
+ddrescue
+debconf
+debconf-i18n
+debianutils
+debootstrap
+deborphan
+dhcp-client
+dialog
+diff
+dmidecode
+dmraid
+dmsetup
+dosfstools
+dpkg
+dselect
+e2fsprogs
+e3
+eject
+ethtool
+file
+file-rc
+findutils
+firmware-ipw3945
+fnord
+fuse-utils
+gawk
+gpm
+grep
+grml2hd
+grml2hd-utils
+grml2usb
+grml-autoconfig
+grml-debian-keyring
+grml-debootstrap
+grml-docs
+grml-etc
+grml-etc-core
+grml-hwinfo
+grml-network
+grml-policyrcd
+grml-rebuildfstab
+grml-saveconfig
+grml-scanpartitions
+grml-scripts
+grml-shlib
+grml-small
+grml-tips
+grml-usleep
+grub
+guessnet
+gzip
+hdparm
+hostname
+htop
+hwinfo
+ifplugd
+ifupdown
+inetutils-inetd
+initramfs-tools
+initscripts
+iproute
+iputils-ping
+ipw3945d
+ipw-firmware
+jed
+jed-common
+klibc-utils
+knockd
+laptop-detect
+less
+lilo
+links
+live-initramfs
+localepurge
+lockfile-progs
+login
+logrotate
+lrzsz
+lsof
+lvm2
+makedev
+mawk
+mbr
+mdadm
+memtester
+mgetty
+mktemp
+module-init-tools
+most
+mount
+mpack
+mtools
+mtr-tiny
+ncftp
+netbase
+netcat
+net-tools
+nfs-common
+ntfsprogs
+ntpdate
+nvi
+openssh-client openssh-server
+passwd
+patch
+pciutils usbutils
+ppp
+pppoeconf
+prism54-firmware
+procinfo
+procps
+psmisc
+pump
+readline-common
+reiserfsprogs
+resolvconf
+rsync
+rungetty
+screen
+scsiadd
+sed
+ser2net
+setserial
+sharutils
+smartmontools
+socket
+statserial
+strace
+sudo
+symlinks
+syslinux
+syslog-ng
+sysutils
+sysvinit
+sysvinit-utils
+tar
+tcpd
+tcpdump
+telnet
+timeout
+tinysnmp-tools
+tofrodos
+tzdata
+ucf
+udev
+unp
+unzip
+unzoo
+update-inetd
+util-linux
+vlan
+vlock
+wget
+whiptail
+wipe
+wireless-tools
+wireless-tools wpasupplicant
+wpasupplicant
+xfsprogs
+zip
+zsh
+
+PACKAGES aptitude I386 
+linux-image-2.6.22-grml aufs-modules-2.6.22-grml
index 9a71298..0c9ffb1 100644 (file)
@@ -8,7 +8,7 @@
 ################################################################################
 
 arguments=(
-  '-c:classe(s):(`cd /etc/grml/fai/config/package_config && ls`)'
+  '-c:classe(s):($(cd /etc/grml/fai/config/class/ && ls *.var | tr -d '.var'))'
   '-F[force execution without prompting for yes/no]'
   '-h[display usage information]'
   '-s:Debian suite:(stable testing unstable etch lenny sid)'